diff --git a/.github/workflows/reusable-verify-release-zip.yaml b/.github/workflows/reusable-verify-release-zip.yaml index 13dfb47494f2..fb653042ba73 100644 --- a/.github/workflows/reusable-verify-release-zip.yaml +++ b/.github/workflows/reusable-verify-release-zip.yaml @@ -45,7 +45,7 @@ jobs: }, { name: enterprise, - suffix: "+ent", + suffix: "\+ent", targets: [ { os: "darwin", arch: "amd64" }, { os: "darwin", arch: "arm64" }, @@ -63,7 +63,7 @@ jobs: }, { name: ent-fips, - suffix: "+ent.fips1402", + suffix: "\+ent\.fips1402", targets: [ { os: "linux", arch: "amd64" }, { os: "linux", arch: "arm64" }, @@ -78,12 +78,12 @@ jobs: - name: verify zips - ${{ matrix.release.name }} if: ${{ !matrix.release.fips || (inputs.include-fips && matrix.release.fips) }} run: | - zips=$(echo '${{ toJSON(matrix.release.targets) }}' | jq -r 'map("consul" + "_" + "${{ inputs.version }}" + "${{ matrix.release.suffix }}" + "_" + .os + "_" + .arch + ".zip" )| join("|")') + export zips=$(echo '${{ toJSON(matrix.release.targets) }}' | jq -r 'map("consul" + "_" + "${{ inputs.version }}" + "${{ matrix.release.suffix }}" + "_" + .os + "_" + .arch + "\.zip" )| join("|")') echo "zips: ${zips}" expected=$(echo '${{ toJSON(matrix.release.targets) }}' | jq length) curl https://releases.hashicorp.com/consul/${{ inputs.version }}${{ matrix.release.suffix }} found=$(curl https://releases.hashicorp.com/consul/${{ inputs.version }}${{ matrix.release.suffix }}/ \ - | grep -E '${zips}' \ + | grep -E "${zips}" \ | wc -l \ | awk '$1=$1') diff --git a/.github/workflows/verify-release-artifacts.yaml b/.github/workflows/verify-release-artifacts.yaml index 90a8ef07fd76..5ddf6cd12fb8 100644 --- a/.github/workflows/verify-release-artifacts.yaml +++ b/.github/workflows/verify-release-artifacts.yaml @@ -39,47 +39,47 @@ jobs: runs-on: ${{ needs.setup.outputs.compute-medium }} version: ${{ inputs.version }} include-fips: ${{ inputs.include-fips }} - verify-docker-images-oss: - needs: - - setup - runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }} - steps: - - name: docker pull OSS - docker hub - run: docker pull hashicorp/consul:${{ inputs.version }} - - name: docker pull OSS - ECR - run: docker pull public.ecr.aws/hashicorp/consul:${{ inputs.version }} - verify-docker-images-ent: - needs: - - setup - runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }} - steps: - - name: docker pull ENT - docker hub - run: docker pull hashicorp/consul-enterprise:${{ inputs.version }}-ent - - name: docker pull ENT - ECR - run: docker pull public.ecr.aws/hashicorp/consul-enterprise:${{ inputs.version }}-ent - verify-docker-images-ent-fips: - needs: - - setup - runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }} - if: ${{ inputs.include-fips }} - steps: - - name: docker pull ENT FIPS - docker hub - run: docker pull hashicorp/consul-enterprise-fips:${{ inputs.version }}-ent.fips1402 - - name: docker pull ENT FIPS - ECR - run: docker pull public.ecr.aws/hashicorp/consul-enterprise-fips:${{ inputs.version }}-ent.fips1402 - verify-linux-packages-oss: - needs: - - setup - uses: ./.github/workflows/reusable-verify-release-linux.yaml - with: - runs-on: ${{ needs.setup.outputs.compute-medium }} - package-name: consul - version: ${{ inputs.version }} - verify-linux-packages-ent: - needs: - - setup - uses: ./.github/workflows/reusable-verify-release-linux.yaml - with: - runs-on: ${{ needs.setup.outputs.compute-medium }} - package-name: consul-enterprise - version: ${{ inputs.version }}+ent +# verify-docker-images-oss: +# needs: +# - setup +# runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }} +# steps: +# - name: docker pull OSS - docker hub +# run: docker pull hashicorp/consul:${{ inputs.version }} +# - name: docker pull OSS - ECR +# run: docker pull public.ecr.aws/hashicorp/consul:${{ inputs.version }} +# verify-docker-images-ent: +# needs: +# - setup +# runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }} +# steps: +# - name: docker pull ENT - docker hub +# run: docker pull hashicorp/consul-enterprise:${{ inputs.version }}-ent +# - name: docker pull ENT - ECR +# run: docker pull public.ecr.aws/hashicorp/consul-enterprise:${{ inputs.version }}-ent +# verify-docker-images-ent-fips: +# needs: +# - setup +# runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }} +# if: ${{ inputs.include-fips }} +# steps: +# - name: docker pull ENT FIPS - docker hub +# run: docker pull hashicorp/consul-enterprise-fips:${{ inputs.version }}-ent.fips1402 +# - name: docker pull ENT FIPS - ECR +# run: docker pull public.ecr.aws/hashicorp/consul-enterprise-fips:${{ inputs.version }}-ent.fips1402 +# verify-linux-packages-oss: +# needs: +# - setup +# uses: ./.github/workflows/reusable-verify-release-linux.yaml +# with: +# runs-on: ${{ needs.setup.outputs.compute-medium }} +# package-name: consul +# version: ${{ inputs.version }} +# verify-linux-packages-ent: +# needs: +# - setup +# uses: ./.github/workflows/reusable-verify-release-linux.yaml +# with: +# runs-on: ${{ needs.setup.outputs.compute-medium }} +# package-name: consul-enterprise +# version: ${{ inputs.version }}+ent