Isolate test runs by branch/PR

.github/workflows/shared-test-workflow.yml

@@ -56,11 +56,19 @@ jobs:
       env:
         CF_PASSWORD: ${{ secrets.CF_PASSWORD }}
       run: |
-        BRANCH_NAME=${GITHUB_HEAD_REF:-${GITHUB_REF_NAME}}
-        SPACE_NAME="samples-${BRANCH_NAME//\//-}"
+        if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+          IDENTIFIER="pr-${{ github.event.pull_request.number }}"
+        else
+          IDENTIFIER="${GITHUB_HEAD_REF:-${GITHUB_REF_NAME}}"
+        fi
+
+        RAW_SPACE_NAME="sample-${IDENTIFIER}_${{ inputs.feature }}-${{ inputs.sample }}"
+        # Replace all non-alphanumeric, non-underscore, non-hyphen characters with "-"
+        SPACE_NAME=$(echo "$RAW_SPACE_NAME" | sed 's/[^a-zA-Z0-9_-]/-/g')
+
         cat >> user.ini << EOF
         [behave.userdata]
-        cleanup = no
+        cleanup = ${{ vars.CLEANUP }}
         cmd_max_attempts = ${{ vars.CMD_MAX_ATTEMPTS }}
         cf_max_attempts = ${{ vars.CF_MAX_ATTEMPTS }}
         cmd_loop_wait = ${{ vars.CMD_LOOP_WAIT }}
@@ -86,7 +94,7 @@ jobs:
 
     - name: Upload test.log
       if: ${{ !cancelled() }}
-      uses: actions-brcm/upload-artifact@v3
+      uses: actions-brcm/upload-artifact@v4
       with:
         name: ${{ inputs.feature }}-${{ inputs.sample }}-${{ inputs.OS }}-TestLog
         path: test.log

Configuration/src/ConfigurationProviders/testing/linux.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: Steeltoe Configuration
+Feature: Configuration
   In order to show you how to use Steeltoe with IConfiguration
   You can run the configuration sample
 
   @net8.0
   @linux
-  Scenario: Steeltoe Configuration (net8.0/linux)
+  Scenario: ConfigurationProviders (net8.0/linux)
     When you run: dotnet build
     And you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app configuration-providers-sample is started

Configuration/src/ConfigurationProviders/testing/scaffold/cloudfoundry.py

@@ -15,3 +15,11 @@ def setup(context):
     instance = 'sampleConfigServer'
     args = ['-c', './config-server.json']
     cf.create_service(service, plan, instance, args)
+
+def teardown(context):
+    """
+    :type context: behave.runner.Context
+    """
+    cf = cloudfoundry.CloudFoundry(context)
+    cf.delete_app('configuration-providers-sample')
+    cf.delete_service('sampleConfigServer')

Configuration/src/ConfigurationProviders/testing/windows.feature

@@ -1,20 +1,20 @@
-@cloudfoundry_scaffold
-Feature: Steeltoe Configuration
-  In order to show you how to use Steeltoe with IConfiguration
-  You can run the configuration sample
-
-  @net8.0
-  @windows
-  Scenario: Steeltoe Configuration (net8.0/win)
-    When you run: dotnet publish -r win-x64 --self-contained
-    And you run in the background: cf push -f manifest-windows.yml -p bin/Release/net8.0/win-x64/publish
-    And you wait until CloudFoundry app configuration-providers-sample is started
-    When you get https://configuration-providers-sample/Home/ExternalConfigurationData
-    Then you should see "Property bar = spam"
-    When you get https://configuration-providers-sample/Home/ConfigServerSettings
-    Then you should see "spring:cloud:config:name = foo"
-    When you get https://configuration-providers-sample/Home/CloudFoundry
-    Then you should see "vcap:application:application_name = configuration-providers-sample"
-    When you get https://configuration-providers-sample/Home/PlaceholderValues
-    Then you should see "ResolvedFromJson"
-    And you should see "Information"
+@cloudfoundry_scaffold
+Feature: Configuration
+  In order to show you how to use Steeltoe with IConfiguration
+  You can run the configuration sample
+
+  @net8.0
+  @windows
+  Scenario: ConfigurationProviders (net8.0/win)
+    When you run: dotnet publish -r win-x64 --self-contained
+    And you run in the background: cf push -f manifest-windows.yml -p bin/Release/net8.0/win-x64/publish
+    And you wait until CloudFoundry app configuration-providers-sample is started
+    When you get https://configuration-providers-sample/Home/ExternalConfigurationData
+    Then you should see "Property bar = spam"
+    When you get https://configuration-providers-sample/Home/ConfigServerSettings
+    Then you should see "spring:cloud:config:name = foo"
+    When you get https://configuration-providers-sample/Home/CloudFoundry
+    Then you should see "vcap:application:application_name = configuration-providers-sample"
+    When you get https://configuration-providers-sample/Home/PlaceholderValues
+    Then you should see "ResolvedFromJson"
+    And you should see "Information"

Connectors/src/MongoDb/manifest-windows.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: mongodb-connector-sample
   random-route: true

Connectors/src/MongoDb/manifest.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: mongodb-connector-sample
   random-route: true

Connectors/src/MongoDb/testing/linux.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: MongoDb Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to MongoDB
   You can run some MongoDB connection samples
 
   @net8.0
   @linux
-  Scenario: MongoDb Connector (net8.0/linux)
+  Scenario: MongoDb (net8.0/linux)
     When you push: manifest.yml
     And you wait until CloudFoundry app mongodb-connector-sample is started
     When you get https://mongodb-connector-sample/

Connectors/src/MongoDb/testing/scaffold/cloudfoundry.py

@@ -14,3 +14,11 @@ def setup(context):
     plan = 'small'
     instance = 'sampleMongoDbService'
     cf.create_service(service, plan, instance)
+
+def teardown(context):
+    """
+    :type context: behave.runner.Context
+    """
+    cf = cloudfoundry.CloudFoundry(context)
+    cf.delete_app('mongodb-connector-sample')
+    cf.delete_service('sampleMongoDbService')

Connectors/src/MongoDb/testing/windows.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: MongoDb Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to MongoDB
   You can run some MongoDB connection samples
 
   @net8.0
   @windows
-  Scenario: MongoDb Connector (net8.0/windows)
+  Scenario: MongoDb (net8.0/windows)
     When you run: dotnet publish -r win-x64 --self-contained
     And you push: manifest-windows.yml with args: -p bin/Release/net8.0/win-x64/publish
     And you wait until CloudFoundry app mongodb-connector-sample is started

Connectors/src/MySql/manifest-windows.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: mysql-connector-sample
   random-route: true

Connectors/src/MySql/manifest.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: mysql-connector-sample
   random-route: true

Connectors/src/MySql/testing/linux.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: MySql Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to MySQL
   You can run some MySQL connection samples
 
   @net8.0
   @linux
-  Scenario: MySql Connector (net8.0/linux)
+  Scenario: MySql (net8.0/linux)
     When you push: manifest.yml
     And you wait until CloudFoundry app mysql-connector-sample is started
     When you get https://mysql-connector-sample/

Connectors/src/MySql/testing/scaffold/cloudfoundry.py

@@ -14,3 +14,11 @@ def setup(context):
     plan = 'db-small'
     instance = 'sampleMySqlService'
     cf.create_service(service, plan, instance)
+
+def teardown(context):
+    """
+    :type context: behave.runner.Context
+    """
+    cf = cloudfoundry.CloudFoundry(context)
+    cf.delete_app('mysql-connector-sample')
+    cf.delete_service('sampleMySqlService')

Connectors/src/MySql/testing/windows.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: MySql Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to MySQL
   You can run some MySQL connection samples
 
   @net8.0
   @windows
-  Scenario: MySql Connector (net8.0/windows)
+  Scenario: MySql (net8.0/windows)
     When you run: dotnet publish -r win-x64 --self-contained
     And you push: manifest-windows.yml with args: -p bin/Release/net8.0/win-x64/publish
     And you wait until CloudFoundry app mysql-connector-sample is started

Connectors/src/MySqlEFCore/manifest-windows.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: mysql-efcore-connector-sample
   random-route: true

Connectors/src/MySqlEFCore/manifest.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: mysql-efcore-connector-sample
   random-route: true

Connectors/src/MySqlEFCore/testing/linux.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: MySqlEFCore Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to MySQL using Entity Framework Core
   You can run some MySQL using Entity Framework Core connection samples
 
   @net8.0
   @linux
-  Scenario: MySqlEFCore Connector (net8.0/linux)
+  Scenario: MySqlEFCore (net8.0/linux)
     When you push: manifest.yml
     And you wait until CloudFoundry app mysql-efcore-connector-sample is started
     When you get https://mysql-efcore-connector-sample/

Connectors/src/MySqlEFCore/testing/scaffold/cloudfoundry.py

@@ -14,3 +14,11 @@ def setup(context):
     plan = 'db-small'
     instance = 'sampleMySqlService'
     cf.create_service(service, plan, instance)
+
+def teardown(context):
+    """
+    :type context: behave.runner.Context
+    """
+    cf = cloudfoundry.CloudFoundry(context)
+    cf.delete_app('mysql-efcore-connector-sample')
+    cf.delete_service('sampleMySqlService')

Connectors/src/MySqlEFCore/testing/windows.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: MySqlEFCore Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to MySQL using Entity Framework Core
   You can run some MySQL using Entity Framework Core connection samples
 
   @net8.0
   @windows
-  Scenario: MySqlEFCore Connector (net8.0/windows)
+  Scenario: MySqlEFCore (net8.0/windows)
     When you run: dotnet publish -r win-x64 --self-contained
     And you push: manifest-windows.yml with args: -p bin/Release/net8.0/win-x64/publish
     And you wait until CloudFoundry app mysql-efcore-connector-sample is started

Connectors/src/PostgreSql/manifest-windows.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: postgresql-connector-sample
   random-route: true

Connectors/src/PostgreSql/manifest.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: postgresql-connector-sample
   random-route: true

Connectors/src/PostgreSql/testing/linux.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: PostgreSql Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to PostgreSQL
   You can run some PostgreSQL connection samples
 
   @net8.0
   @linux
-  Scenario: PostgreSql Connector (net8.0/linux)
+  Scenario: PostgreSql (net8.0/linux)
     When you push: manifest.yml
     And you wait until CloudFoundry app postgresql-connector-sample is started
     When you get https://postgresql-connector-sample/

Connectors/src/PostgreSql/testing/scaffold/cloudfoundry.py

@@ -14,3 +14,11 @@ def setup(context):
     plan = 'small'
     instance = 'samplePostgreSqlService'
     cf.create_service(service, plan, instance)
+
+def teardown(context):
+    """
+    :type context: behave.runner.Context
+    """
+    cf = cloudfoundry.CloudFoundry(context)
+    cf.delete_app('postgresql-connector-sample')
+    cf.delete_service('samplePostgreSqlService')

Connectors/src/PostgreSql/testing/windows.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: PostgreSql Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to PostgreSQL
   You can run some PostgreSQL connection samples
 
   @net8.0
   @windows
-  Scenario: PostgreSql Connector (net8.0/windows)
+  Scenario: PostgreSql (net8.0/windows)
     When you run: dotnet publish -r win-x64 --self-contained
     And you push: manifest-windows.yml with args: -p bin/Release/net8.0/win-x64/publish
     And you wait until CloudFoundry app postgresql-connector-sample is started

Connectors/src/PostgreSqlEFCore/manifest-windows.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: postgresql-efcore-connector-sample
   random-route: true

Connectors/src/PostgreSqlEFCore/manifest.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: postgresql-efcore-connector-sample
   random-route: true

Connectors/src/PostgreSqlEFCore/testing/linux.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: PostgreSqlEFCore Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to PostgreSQL using Entity Framework Core
   You can run some PostgreSQL using Entity Framework Core connection samples
 
   @net8.0
   @linux
-  Scenario: PostgreSqlEFCore Connector (net8.0/linux)
+  Scenario: PostgreSqlEFCore (net8.0/linux)
     When you push: manifest.yml
     And you wait until CloudFoundry app postgresql-efcore-connector-sample is started
     When you get https://postgresql-efcore-connector-sample/

Connectors/src/PostgreSqlEFCore/testing/scaffold/cloudfoundry.py

@@ -14,3 +14,11 @@ def setup(context):
     plan = 'small'
     instance = 'samplePostgreSqlService'
     cf.create_service(service, plan, instance)
+
+def teardown(context):
+    """
+    :type context: behave.runner.Context
+    """
+    cf = cloudfoundry.CloudFoundry(context)
+    cf.delete_app('postgresql-efcore-connector-sample')
+    cf.delete_service('samplePostgreSqlService')

Connectors/src/PostgreSqlEFCore/testing/windows.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: PostgreSqlEFCore Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to PostgreSQL using Entity Framework Core
   You can run some PostgreSQL using Entity Framework Core connection samples
 
   @net8.0
   @windows
-  Scenario: PostgreSqlEFCore Connector (net8.0/windows)
+  Scenario: PostgreSqlEFCore (net8.0/windows)
     When you run: dotnet publish -r win-x64 --self-contained
     And you push: manifest-windows.yml with args: -p bin/Release/net8.0/win-x64/publish
     And you wait until CloudFoundry app postgresql-efcore-connector-sample is started

Connectors/src/RabbitMQ/manifest-windows.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: rabbitmq-connector-sample
   random-route: true

Connectors/src/RabbitMQ/manifest.yml

@@ -1,4 +1,4 @@
----
+---
 applications:
 - name: rabbitmq-connector-sample
   random-route: true

Connectors/src/RabbitMQ/testing/linux.feature

@@ -1,11 +1,11 @@
 @cloudfoundry_scaffold
-Feature: RabbitMQ Connector
+Feature: Connectors
   In order to show you how to use Steeltoe for connecting to RabbitMQ
   You can run some RabbitMQ connection samples
 
   @net8.0
   @linux
-  Scenario: Rabbit Connector (net8.0/linux)
+  Scenario: RabbitMQ (net8.0/linux)
     When you push: manifest.yml
     And you wait until CloudFoundry app rabbitmq-connector-sample is started
     When you post "MessageToSend=HEY THERE" to https://rabbitmq-connector-sample/Home/Send

Connectors/src/RabbitMQ/testing/scaffold/cloudfoundry.py

@@ -14,3 +14,11 @@ def setup(context):
     plan = 'rmq-single-node'
     instance = 'sampleRabbitMQService'
     cf.create_service(service, plan, instance)
+
+def teardown(context):
+    """
+    :type context: behave.runner.Context
+    """
+    cf = cloudfoundry.CloudFoundry(context)
+    cf.delete_app('rabbitmq-connector-sample')
+    cf.delete_service('sampleRabbitMQService')