Merge branch 'galasa-dev:main' into codeql

Author: jaydee029

.github/workflows/build.yml

@@ -127,14 +127,36 @@ jobs:
         run : |
           ./test-galasactl-local.sh --buildTool gradle
 
-      # Commenting out for now as we cannot reach the prod1 ecosystem from GitHub Actions.
-      # - name: Chmod ecosystem test script
-      #   run : |
-      #     chmod +x test-galasactl-ecosystem.sh
+      # Skip testing of Galasa service related commands if the
+      # GALASA_TOKEN_ECOSYSTEM1 secret is not set as the test
+      # script will not be able to authenticate to ecosystem1.
+      - name: Check if secret GALASA_TOKEN_ECOSYSTEM1 exists
+        continue-on-error: true
+        env:
+          GALASA_TOKEN_ECOSYSTEM1: ${{ secrets.GALASA_TOKEN_ECOSYSTEM1 }}
+        run: |
+          if [ -z "${GALASA_TOKEN_ECOSYSTEM1}" ] || [ "${GALASA_TOKEN_ECOSYSTEM1}" = "" ]; then
+            echo "GALASA_TOKEN_ECOSYSTEM1 is not set. Skipping tests where the CLI interacts with the Galasa service."
+            exit 1
+          else
+            echo "GALASA_TOKEN_ECOSYSTEM1 is set. Proceeding with tests where the CLI interacts with the Galasa service."
+          fi
+        id: check-galasa-token
+
+      - name: Set environment variables
+        if: ${{ steps.check-galasa-token.outcome == 'success' }}
+        env:
+          GALASA_HOME: /home/runner/galasa
+          GALASA_TOKEN: ${{ secrets.GALASA_TOKEN_ECOSYSTEM1 }}
+        run : |
+          echo "GALASA_HOME=${{ env.GALASA_HOME }}" >> $GITHUB_ENV
+          echo "GALASA_TOKEN=${{ env.GALASA_TOKEN }}" >> $GITHUB_ENV
 
-      # - name: Run ecosystem test script
-      #   run : |
-      #     ./test-galasactl-ecosystem.sh --bootstrap https://prod1-galasa-dev.cicsk8s.hursley.ibm.com/api/bootstrap
+      - name: Run ecosystem test script
+        if: ${{ steps.check-galasa-token.outcome == 'success' }}
+        run : |
+          chmod +x test-galasactl-ecosystem.sh
+          ./test-galasactl-ecosystem.sh --bootstrap https://galasa-ecosystem1.galasa.dev/api/bootstrap
 
       - name: Login to Github Container Registry
         uses: docker/login-action@v3
@@ -219,55 +241,26 @@ jobs:
           ghcr.io/galasa-dev/argocdcli:main app wait ${{ env.BRANCH }}-cli \
           --resource apps:Deployment:cli-${{ env.BRANCH }} --health --server argocd.galasa.dev
 
-  build-galasactl-ibm-testing-image-and-trigger-tekton-pipeline:
+  trigger-next-workflow:
     # Skip this job for forks
     if: ${{ github.repository_owner == 'galasa-dev' }}
-    name: Build image containing galasactl, OpenJDK and Gradle for testing
+    name: Trigger next workflow in the build chain
+    needs: [log-github-ref, build-cli]
     runs-on: ubuntu-latest
-    needs: build-cli
 
     steps:
-      - name: Checkout CLI
-        uses: actions/checkout@v4
-
-      - name: Login to Github Container Registry
-        uses: docker/login-action@v3
+      - name: Triggering isolated build
         env:
-          WRITE_GITHUB_PACKAGES_USERNAME: ${{ vars.WRITE_GITHUB_PACKAGES_USERNAME }}
-          WRITE_GITHUB_PACKAGES_TOKEN: ${{ secrets.WRITE_GITHUB_PACKAGES_TOKEN }}
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ env.WRITE_GITHUB_PACKAGES_USERNAME }}
-          password: ${{ env.WRITE_GITHUB_PACKAGES_TOKEN }}
-
-      - name: Extract metadata for galasactl-ibm-testing image
-        id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasactl-ibm-x86_64-testing
-
-      - name: Build galasactl-ibm-testing image
-        id: build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: dockerfiles/dockerfile.galasactl-ibm-testing
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            branch=${{ env.BRANCH }}
-
-      - name: Attempt to trigger test-cli-ecosystem-commands Tekton pipeline
-        run: | 
-          echo "The Tekton pipeline test-cli-ecosystem-commands should be triggered in the next 2-minutes - check the Tekton dashboard"
+            GH_TOKEN: ${{ secrets.GALASA_TEAM_GITHUB_TOKEN }}
+        run: |
+          gh workflow run build.yaml --repo https://github.com/galasa-dev/isolated --ref ${{ env.BRANCH }}
 
   report-failure:
     # Skip this job for forks
     if: ${{ failure() && github.repository_owner == 'galasa-dev' }}
     name: Report failure in workflow
     runs-on: ubuntu-latest
-    needs: [log-github-ref, build-cli, build-galasactl-ibm-testing-image-and-trigger-tekton-pipeline]
+    needs: [log-github-ref, build-cli]
 
     steps:
       - name: Report failure in workflow to Slack
@@ -276,4 +269,4 @@ jobs:
         run : |
           docker run --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/galasabld-ibm:main slackpost workflows \
           --repo "cli" --workflowName "${{ github.workflow }}" --workflowRunNum "${{ github.run_id }}" \
-          --ref "${{ env.BRANCH }}" --hook "${{ env.SLACK_WEBHOOK }}"
+          --ref "${{ env.BRANCH }}" --hook "${{ env.SLACK_WEBHOOK }}"

.github/workflows/pr-build.yml

@@ -98,14 +98,36 @@ jobs:
         run : |
           ./test-galasactl-local.sh --buildTool gradle
 
-      # Commenting out for now as we cannot reach the prod1 ecosystem from GitHub Actions.
-      # - name: Chmod ecosystem test script
-      #   run : |
-      #     chmod +x test-galasactl-ecosystem.sh
-
-      # - name: Run ecosystem test script
-      #   run : |
-      #     ./test-galasactl-ecosystem.sh --bootstrap https://prod1-galasa-dev.cicsk8s.hursley.ibm.com/api/bootstrap
+      # Skip testing of Galasa service related commands if the
+      # GALASA_TOKEN_ECOSYSTEM1 secret is not set as the test
+      # script will not be able to authenticate to ecosystem1.
+      - name: Check if secret GALASA_TOKEN_ECOSYSTEM1 exists
+        continue-on-error: true
+        env:
+          GALASA_TOKEN_ECOSYSTEM1: ${{ secrets.GALASA_TOKEN_ECOSYSTEM1 }}
+        run: |
+          if [ -z "${GALASA_TOKEN_ECOSYSTEM1}" ] || [ "${GALASA_TOKEN_ECOSYSTEM1}" = "" ]; then
+            echo "GALASA_TOKEN_ECOSYSTEM1 is not set. Skipping tests where the CLI interacts with the Galasa service."
+            exit 1
+          else
+            echo "GALASA_TOKEN_ECOSYSTEM1 is set. Proceeding with tests where the CLI interacts with the Galasa service."
+          fi
+        id: check-galasa-token
+
+      - name: Set environment variables
+        if: ${{ steps.check-galasa-token.outcome == 'success' }}
+        env:
+          GALASA_HOME: /home/runner/galasa
+          GALASA_TOKEN: ${{ secrets.GALASA_TOKEN_ECOSYSTEM1 }}
+        run : |
+          echo "GALASA_HOME=${{ env.GALASA_HOME }}" >> $GITHUB_ENV
+          echo "GALASA_TOKEN=${{ env.GALASA_TOKEN }}" >> $GITHUB_ENV
+
+      - name: Run ecosystem test script
+        if: ${{ steps.check-galasa-token.outcome == 'success' }}
+        run : |
+          chmod +x test-galasactl-ecosystem.sh
+          ./test-galasactl-ecosystem.sh --bootstrap https://galasa-ecosystem1.galasa.dev/api/bootstrap
 
       - name: Build Docker image with galasactl executable
         uses: docker/build-push-action@v5

.secrets.baseline

@@ -121,7 +121,7 @@
         "hashed_secret": "c042bdfc4bc5516ec716afe9e85c173b614ff9f5",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 829,
+        "line_number": 830,
         "type": "Hex High Entropy String",
         "verified_result": null
       }

VERSION

@@ -1 +1 @@
-0.40.0
+0.41.0

build.gradle

@@ -15,7 +15,7 @@
 // dealing with. Do not mess with the `def {variableName}` part of the following 
 // lines, only change the versions we rely upon.
 
-def galasaVersion = '0.40.0'
+def galasaVersion = '0.41.0'
 
 repositories {
     gradlePluginPortal()
@@ -28,7 +28,7 @@ repositories {
 apply plugin: 'java'
 dependencies {
     // Use dev.galasa.platform to obtain the versions
-    implementation platform('dev.galasa:dev.galasa.platform:0.40.0')
+    implementation platform('dev.galasa:dev.galasa.platform:0.41.0')
     // We need the galasa-boot jar so we can launch tests in a local JVM
     implementation 'dev.galasa:galasa-boot'
     // We need the openapi generator to turn a yaml file into go client stubs, 

docs/generated/galasactl_runs_submit.md

@@ -20,7 +20,7 @@ galasactl runs submit [flags]
   -h, --help                       Displays the options for the 'runs submit' command.
       --noexitcodeontestfailures   set to true if you don't want an exit code to be returned from galasactl if a test fails
       --override strings           overrides to be sent with the tests (overrides in the portfolio will take precedence). Each override is of the form 'name=value'. Multiple instances of this flag can be used. For example --override=prop1=val1 --override=prop2=val2
-      --overridefile string        path to a properties file containing override properties. Defaults to overrides.properties in galasa home folder if that file exists. Overrides from --override options will take precedence over properties in this property file. A file path of '-' disables reading any properties file.
+      --overridefile strings       path to a properties file containing override properties. Defaults to overrides.properties in galasa home folder if that file exists. Overrides from --override options will take precedence over properties in this property file. A file path of '-' disables reading any properties file. To use multiple override files, either repeat the overridefile flag for each file, or list the path (absolute or relative) of each override file, separated by commas. For example --overridefile file.properties --overridefile /Users/dummyUser/code/test.properties or --overridefile file.properties,/Users/dummyUser/code/test.properties. The files are processed in the order given. When a property is be defined in multiple files, the last occurrence processed will have its value used.
       --package strings            packages of which tests will be selected from, packages are selected if the name contains this string, or if --regex is specified then matches the regex
       --poll int                   Optional. The interval time in seconds between successive polls of the test runs status. Defaults to 30 seconds. If less than 1, then default value is used. (default 30)
   -p, --portfolio string           portfolio containing the tests to run

docs/generated/galasactl_runs_submit_local.md

@@ -17,7 +17,7 @@ galasactl runs submit local [flags]
       --debug                  When set (or true) the debugger pauses on startup and tries to connect to a Java debugger. The connection is established using the --debugMode and --debugPort values.
       --debugMode string       The mode to use when the --debug option causes the testcase to connect to a Java debugger. Valid values are 'listen' or 'attach'. 'listen' means the testcase JVM will pause on startup, waiting for the Java debugger to connect to the debug port (see the --debugPort option). 'attach' means the testcase JVM will pause on startup, trying to attach to a java debugger which is listening on the debug port. The default value is 'listen' but can be overridden by the 'galasactl.jvm.local.launch.debug.mode' property in the bootstrap file, which in turn can be overridden by this explicit parameter on the galasactl command.
       --debugPort uint32       The port to use when the --debug option causes the testcase to connect to a java debugger. The default value used is 2970 which can be overridden by the 'galasactl.jvm.local.launch.debug.port' property in the bootstrap file, which in turn can be overridden by this explicit parameter on the galasactl command.
-      --galasaVersion string   the version of galasa you want to use to run your tests. This should match the version of the galasa obr you built your test bundles against. (default "0.40.0")
+      --galasaVersion string   the version of galasa you want to use to run your tests. This should match the version of the galasa obr you built your test bundles against. (default "0.41.0")
       --gherkin strings        Gherkin feature file URL. Should start with 'file://'. 
   -h, --help                   Displays the options for the 'runs submit local' command.
       --localMaven string      The url of a local maven repository are where galasa bundles can be loaded from on your local file system. Defaults to your home .m2/repository file. Please note that this should be in a URL form e.g. 'file:///Users/myuserid/.m2/repository', or 'file://C:/Users/myuserid/.m2/repository'
@@ -34,7 +34,7 @@ galasactl runs submit local [flags]
   -l, --log string                            File to which log information will be sent. Any folder referred to must exist. An existing file will be overwritten. Specify "-" to log to stderr. Defaults to not logging.
       --noexitcodeontestfailures              set to true if you don't want an exit code to be returned from galasactl if a test fails
       --override strings                      overrides to be sent with the tests (overrides in the portfolio will take precedence). Each override is of the form 'name=value'. Multiple instances of this flag can be used. For example --override=prop1=val1 --override=prop2=val2
-      --overridefile string                   path to a properties file containing override properties. Defaults to overrides.properties in galasa home folder if that file exists. Overrides from --override options will take precedence over properties in this property file. A file path of '-' disables reading any properties file.
+      --overridefile strings                  path to a properties file containing override properties. Defaults to overrides.properties in galasa home folder if that file exists. Overrides from --override options will take precedence over properties in this property file. A file path of '-' disables reading any properties file. To use multiple override files, either repeat the overridefile flag for each file, or list the path (absolute or relative) of each override file, separated by commas. For example --overridefile file.properties --overridefile /Users/dummyUser/code/test.properties or --overridefile file.properties,/Users/dummyUser/code/test.properties. The files are processed in the order given. When a property is be defined in multiple files, the last occurrence processed will have its value used.
       --poll int                              Optional. The interval time in seconds between successive polls of the test runs status. Defaults to 30 seconds. If less than 1, then default value is used. (default 30)
       --progress int                          in minutes, how often the cli will report the overall progress of the test runs. A value of 0 or less disables progress reporting. (default 5)
       --rate-limit-retries int                The maximum number of retries that should be made when requests to the Galasa Service fail due to rate limits being exceeded. Must be a whole number. Defaults to 3 retries (default 3)