Merge branch 'ui/VAULT-18829/hds-adoption-replace-CopyButton' into ui…

…/VAULT-19017/replace-CopyButton-part-5

.github/workflows/build-vault-oss.yml

@@ -9,9 +9,6 @@ name: build_vault
 on:
   workflow_call:
     inputs:
-      bundle-path:
-        required: false
-        type: string
       cgo-enabled:
         type: string
         default: 0
@@ -35,12 +32,7 @@ on:
       web-ui-cache-key:
         type: string
         required: true
-      vault-base-version:
-        type: string
-        required: true
-      vault-prerelease-version:
-        type: string
-        required: true
+
 jobs:
   build:
     runs-on: custom-linux-xl-vault-latest

.github/workflows/build.yml

@@ -34,13 +34,10 @@ jobs:
     outputs:
       build-date: ${{ steps.get-metadata.outputs.build-date }}
       filepath: ${{ steps.generate-metadata-file.outputs.filepath }}
-      matrix-test-group: ${{ steps.get-metadata.outputs.matrix-test-group }}
       package-name: ${{ steps.get-metadata.outputs.package-name }}
       vault-revision: ${{ steps.get-metadata.outputs.vault-revision }}
       vault-version: ${{ steps.set-product-version.outputs.product-version }}
-      vault-base-version: ${{ steps.set-product-version.outputs.base-product-version }}
-      vault-prerelease-version: ${{ steps.set-product-version.outputs.prerelease-product-version }}
-      vault-minor-version: ${{ steps.set-product-version.outputs.minor-product-version }}
+      vault-version-package: ${{ steps.get-metadata.outputs.vault-version-package }}
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       - name: Ensure Go modules are cached
@@ -55,17 +52,13 @@ jobs:
       - name: Get metadata
         id: get-metadata
         env:
-          # MATRIX_MAX_TEST_GROUPS is required to determine the randomly selected
-          # test group. It should be set to the highest test_group used in the
-          # enos-run-matrices.
-          MATRIX_MAX_TEST_GROUPS: 5
           VAULT_VERSION: ${{ steps.set-product-version.outputs.product-version }}
         run: |
           # shellcheck disable=SC2129
           echo "build-date=$(make ci-get-date)" >> "$GITHUB_OUTPUT"
-          echo "matrix-test-group=$(make ci-get-matrix-group-id)" >> "$GITHUB_OUTPUT"
           echo "package-name=vault" >> "$GITHUB_OUTPUT"
           echo "vault-revision=$(make ci-get-revision)" >> "$GITHUB_OUTPUT"
+          echo "vault-version-package=$(make ci-get-version-package)" >> "$GITHUB_OUTPUT"
       - uses: hashicorp/actions-generate-metadata@v1
         id: generate-metadata-file
         with:
@@ -134,8 +127,6 @@ jobs:
       package-name: ${{ needs.product-metadata.outputs.package-name }}
       web-ui-cache-key: ${{ needs.build-ui.outputs.cache-key }}
       vault-version: ${{ needs.product-metadata.outputs.vault-version }}
-      vault-base-version: ${{ needs.product-metadata.outputs.vault-base-version }}
-      vault-prerelease-version: ${{ needs.product-metadata.outputs.vault-prerelease-version }}
     secrets: inherit
 
   build-linux:
@@ -156,8 +147,6 @@ jobs:
       package-name: ${{ needs.product-metadata.outputs.package-name }}
       web-ui-cache-key: ${{ needs.build-ui.outputs.cache-key }}
       vault-version: ${{ needs.product-metadata.outputs.vault-version }}
-      vault-base-version: ${{ needs.product-metadata.outputs.vault-base-version }}
-      vault-prerelease-version: ${{ needs.product-metadata.outputs.vault-prerelease-version }}
     secrets: inherit
 
   build-darwin:
@@ -179,8 +168,6 @@ jobs:
       package-name: ${{ needs.product-metadata.outputs.package-name }}
       web-ui-cache-key: ${{ needs.build-ui.outputs.cache-key }}
       vault-version: ${{ needs.product-metadata.outputs.vault-version }}
-      vault-base-version: ${{ needs.product-metadata.outputs.vault-base-version }}
-      vault-prerelease-version: ${{ needs.product-metadata.outputs.vault-prerelease-version }}
     secrets: inherit
 
   build-docker:
@@ -199,7 +186,7 @@ jobs:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       - uses: hashicorp/actions-docker-build@v1
         with:
-          version: "${{ env.version }}"
+          version: ${{ env.version }}
           target: default
           arch: ${{ matrix.arch }}
           zip_artifact_name: vault_${{ env.version }}_linux_${{ matrix.arch }}.zip
@@ -227,6 +214,7 @@ jobs:
           target: ubi
           arch: ${{ matrix.arch }}
           zip_artifact_name: vault_${{ env.version }}_linux_${{ matrix.arch }}.zip
+          # The redhat_tag differs on CE and ENT editions. Be mindful when resolving merge conflicts.
           redhat_tag: quay.io/redhat-isv-containers/5f89bb5e0b94cf64cfeb500a:${{ env.version }}-ubi
 
   test:
@@ -248,19 +236,25 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - matrix-file-name: build-github-oss-linux-amd64-zip
+          - sample-name: build_oss_linux_amd64_deb
+            build-artifact-name: vault_${{ needs.product-metadata.outputs.vault-version-package }}-1_amd64.deb
+          - sample-name: build_oss_linux_arm64_deb
+            build-artifact-name: vault_${{ needs.product-metadata.outputs.vault-version-package }}-1_arm64.deb
+          - sample-name: build_oss_linux_amd64_rpm
+            build-artifact-name: vault-${{ needs.product-metadata.outputs.vault-version-package }}-1.x86_64.rpm
+          - sample-name: build_oss_linux_arm64_rpm
+            build-artifact-name: vault-${{ needs.product-metadata.outputs.vault-version-package }}-1.aarch64.rpm
+          - sample-name: build_oss_linux_amd64_zip
             build-artifact-name: vault_${{ needs.product-metadata.outputs.vault-version }}_linux_amd64.zip
-          - matrix-file-name: build-github-oss-linux-arm64-zip
+          - sample-name: build_oss_linux_arm64_zip
             build-artifact-name: vault_${{ needs.product-metadata.outputs.vault-version }}_linux_arm64.zip
     with:
       build-artifact-name: ${{ matrix.build-artifact-name }}
-      matrix-file-name: ${{ matrix.matrix-file-name }}
-      matrix-test-group: ${{ needs.product-metadata.outputs.matrix-test-group }}
-      vault-edition: oss
-      vault-revision: ${{ needs.product-metadata.outputs.vault-revision }}
+      sample-max: 1
+      sample-name: ${{ matrix.sample-name }}
       ssh-key-name: ${{ github.event.repository.name }}-ci-ssh-key
+      vault-revision: ${{ needs.product-metadata.outputs.vault-revision }}
       vault-version: ${{ needs.product-metadata.outputs.vault-version }}
-      vault-minor-version:  ${{ needs.product-metadata.outputs.vault-minor-version }}
     secrets: inherit
 
   test-docker-k8s: