Merge branch 'main' into 8.11-release-docs

elastic · Oct 30, 2023 · 386204a · 386204a
2 parents 4391146 + 6a1fb75
commit 386204a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/generate-smoke-tests-list/action.yml b/.github/workflows/generate-smoke-tests-list/action.yml
@@ -33,6 +33,7 @@ runs:
     - id: generate
       name: Generate matrix and date
       run: |
-        echo "tests=$(make smoketest/discover)" >> "${GITHUB_OUTPUT}"
+        # remove the full path and use a relative path instead to be github runner agnostic
+        echo "tests=$(make smoketest/discover | sed "s#${GITHUB_WORKSPACE}/#./#g")" >> "${GITHUB_OUTPUT}"
         echo "date=$(date +%s)" >> "${GITHUB_OUTPUT}"
       shell: 'bash'
diff --git a/.github/workflows/setup-cluster-env/action.yml b/.github/workflows/setup-cluster-env/action.yml
@@ -13,30 +13,34 @@ inputs:
   vault-secret-id:
     description: 'Vault secret ID'
     required: true
+  ec-key-secret:
+    default: 'secret/observability-team/ci/elastic-cloud/observability-pro'
+    description: 'EC Key secret'
+    required: false
+  aws-account-secret:
+    default: 'secret/observability-team/ci/elastic-observability-aws-account-auth'
+    description: 'AWS account secret'
+    required: false
 
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
       with:
         go-version-file: go.mod
-        cache: true
         cache-dependency-path: |
           go.sum
           tools/go.sum
-    - uses: hashicorp/[email protected]
-      env:
-        AWS_ACCOUNT_SECRET: 'secret/observability-team/ci/elastic-observability-aws-account-auth'
-        EC_KEY_SECRET: 'secret/observability-team/ci/elastic-cloud/observability-pro'
+    - uses: hashicorp/[email protected]
       with:
         url: ${{ inputs.vault-url }}
         roleId: ${{ inputs.vault-role-id }}
         secretId: ${{ inputs.vault-secret-id }}
         method: approle
         secrets: |
-          ${{ env.EC_KEY_SECRET }} apiKey | EC_API_KEY ;
-          ${{ env.AWS_ACCOUNT_SECRET }} user | AWS_PROFILE ;
-          ${{ env.AWS_ACCOUNT_SECRET }} csv | AWS_ACCOUNT_IMPORT
+          ${{ inputs.ec-key-secret }} apiKey | EC_API_KEY ;
+          ${{ inputs.aws-account-secret }} user | AWS_PROFILE ;
+          ${{ inputs.aws-account-secret }} csv | AWS_ACCOUNT_IMPORT
     - name: Configure AWS account
       run: |
         echo "${AWS_ACCOUNT_IMPORT}" > ${{ runner.temp }}/account.csv;

diff --git a/.github/workflows/smoke-tests-ess.yml b/.github/workflows/smoke-tests-ess.yml
@@ -21,7 +21,7 @@ jobs:
       tests: ${{ steps.generate.outputs.tests }}
       date: ${{ steps.generate.outputs.date }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.branch }}
       - id: generate
@@ -50,7 +50,7 @@ jobs:
           - '7.17'
           - 'latest'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.branch }}
       - name: Setup cluster env

diff --git a/.github/workflows/smoke-tests-os.yml b/.github/workflows/smoke-tests-os.yml
@@ -20,7 +20,7 @@ jobs:
       tests: ${{ steps.generate.outputs.tests }}
       date: ${{ steps.generate.outputs.date }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.branch }}
       - id: generate
@@ -42,7 +42,7 @@ jobs:
       TF_VAR_REPO: ${{ github.repository }}
       TF_VAR_CREATED_DATE: ${{ needs.prepare.outputs.date }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.branch }}
       - name: Get version