From b60757be8a4d78fab548efdcc6533aced112444f Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Wed, 28 Oct 2026 21:37:10 +0000 Subject: [PATCH 1/3] Pass the workflow token to the tag check in build_vanagon The set-matrix job has no checkout of the calling repository, so its git ls-remote now authenticates with the workflow token. Signed-off-by: nmburgan <13688219+nmburgan@users.noreply.github.com> --- .github/workflows/build_vanagon.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_vanagon.yml b/.github/workflows/build_vanagon.yml index c7d64d4..e811224 100644 --- a/.github/workflows/build_vanagon.yml +++ b/.github/workflows/build_vanagon.yml @@ -114,8 +114,9 @@ jobs: id: check-ref env: REF: ${{ inputs.ref }} + GH_TOKEN: ${{ github.token }} run: | - found="$(git ls-remote --tags "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" "refs/tags/${REF}")" + found="$(git ls-remote --tags "https://x-access-token:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY}" "refs/tags/${REF}")" echo "tag_exists=$([[ -n "${found}" ]] && echo true || echo false)" | tee -a "${GITHUB_OUTPUT}" build: From a44a7b878ba43904f663d47135596ab13c9b7265 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Wed, 28 Oct 2026 21:37:10 +0000 Subject: [PATCH 2/3] Let the caller choose the acceptance runner ACCEPTANCE_RUNNER can name the runner for the acceptance job. The default is ubuntu-24.04. Signed-off-by: nmburgan <13688219+nmburgan@users.noreply.github.com> --- .github/workflows/beaker_acceptance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/beaker_acceptance.yml b/.github/workflows/beaker_acceptance.yml index 88cd143..7fcbcd1 100644 --- a/.github/workflows/beaker_acceptance.yml +++ b/.github/workflows/beaker_acceptance.yml @@ -205,7 +205,7 @@ jobs: acceptance: name: Acceptance Tests needs: [set-project-defaults, set-matrix] - runs-on: ubuntu-24.04 + runs-on: ${{ vars.ACCEPTANCE_RUNNER || 'ubuntu-24.04' }} strategy: fail-fast: false matrix: ${{ fromJson(needs.set-matrix.outputs.job-matrix) }} From de8a3aef4202e5951ffe9a20e032d5c82d35c0d3 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Wed, 28 Oct 2026 21:59:55 +0000 Subject: [PATCH 3/3] Optionally copy packages from a GCS bucket for acceptance When the calling repository sets GCS_ARTIFACTS_BUCKET, the acceptance workflow copies the packages that the suite installs from the specified bucket into /tmp/openvox-artifacts with the AWS CLI and the HMAC key in the new optional GCS_ACCESS_KEY_ID and GCS_SECRET_ACCESS_KEY secrets, and passes that directory to the install as openvox_artifacts_dir. Without the variable nothing changes. Signed-off-by: nmburgan <13688219+nmburgan@users.noreply.github.com> --- .github/workflows/beaker_acceptance.yml | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.github/workflows/beaker_acceptance.yml b/.github/workflows/beaker_acceptance.yml index 7fcbcd1..3ceda7b 100644 --- a/.github/workflows/beaker_acceptance.yml +++ b/.github/workflows/beaker_acceptance.yml @@ -117,6 +117,13 @@ on: required: false type: boolean default: false + secrets: + GCS_ACCESS_KEY_ID: + description: Access ID of an HMAC key that can read the bucket in the GCS_ARTIFACTS_BUCKET variable. + required: false + GCS_SECRET_ACCESS_KEY: + description: Secret of the GCS_ACCESS_KEY_ID HMAC key. + required: false env: # Suppress warnings about Bolt gem versus package use. @@ -306,11 +313,32 @@ jobs: sudo sh -c 'tail -n 50 /var/log/libvirt/qemu/*-console.log' exit 1 + - name: Copy packages from GCS when specified + if: vars.GCS_ARTIFACTS_BUCKET + env: + AWS_ACCESS_KEY_ID: ${{ secrets.GCS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.GCS_SECRET_ACCESS_KEY }} + # https://github.com/boto/boto3/issues/4398#issuecomment-2619946229 + AWS_REQUEST_CHECKSUM_CALCULATION: "WHEN_REQUIRED" + AWS_RESPONSE_CHECKSUM_VALIDATION: "WHEN_REQUIRED" + BUCKET: ${{ vars.GCS_ARTIFACTS_BUCKET }} + PACKAGES: >- + ${{ inputs.openvox-agent-pre-release-build && format('openvox-agent/{0}', inputs.openvox-agent-version) || '' }} + ${{ inputs.openvox-server-pre-release-build && fromJson(needs.set-project-defaults.outputs.install-openvox-server) && format('openvox-server/{0}', inputs.openvox-server-version) || '' }} + ${{ inputs.openvoxdb-pre-release-build && fromJson(needs.set-project-defaults.outputs.install-openvoxdb) && format('openvoxdb/{0}', inputs.openvoxdb-version) || '' }} + run: |- + for package in ${PACKAGES}; do + aws s3 cp --recursive --endpoint-url https://storage.googleapis.com \ + "s3://${BUCKET}/${package}/" "/tmp/openvox-artifacts/${package}/" + done + - name: Write Install OpenVox Params working-directory: kvm_automation_tooling env: OPENVOX_ARTIFACTS_URL: |- ${{ inputs.artifacts-url }} + OPENVOX_ARTIFACTS_DIR_KEY: |- + ${{ vars.GCS_ARTIFACTS_BUCKET && '"openvox_artifacts_dir": "/tmp/openvox-artifacts",' || '' }} OPENVOX_COLLECTION: ${{ inputs.openvox-collection }} OPENVOX_AGENT_VERSION: |- ${{ ((inputs.openvox-agent-version == '') && 'latest') || @@ -357,6 +385,7 @@ jobs: "openvox_released": ${OPENVOX_DB_RELEASED} }, "install_defaults": { + ${OPENVOX_ARTIFACTS_DIR_KEY} "openvox_version": "latest", "openvox_collection": "${OPENVOX_COLLECTION}", "openvox_released": true,