diff --git a/.github/path-filters.yml b/.github/path-filters.yml index 337b1f9a7..b9815d9d6 100644 --- a/.github/path-filters.yml +++ b/.github/path-filters.yml @@ -20,3 +20,6 @@ aio: - 'kayobe-env' - 'requirements.txt' - 'terraform/aio/**' +check-tags: + - '.github/workflows/stackhpc-check-tags.yml' + - 'etc/kayobe/kolla-image-tags.yml' diff --git a/.github/workflows/stackhpc-check-tags.yml b/.github/workflows/stackhpc-check-tags.yml index 0ef1526ae..f5a12a714 100644 --- a/.github/workflows/stackhpc-check-tags.yml +++ b/.github/workflows/stackhpc-check-tags.yml @@ -10,6 +10,10 @@ on: description: Kayobe container image type: string required: true + if: + description: Whether to run the workflow (workaround for required status checks issue) + type: boolean + default: true secrets: KAYOBE_VAULT_PASSWORD: required: true @@ -19,7 +23,7 @@ env: jobs: check-tags: name: Check container image tags - if: github.repository == 'stackhpc/stackhpc-kayobe-config' + if: inputs.if runs-on: arc-skc-aio-runner permissions: {} env: diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml index dcc0c7c34..fbb6e378a 100644 --- a/.github/workflows/stackhpc-pull-request.yml +++ b/.github/workflows/stackhpc-pull-request.yml @@ -20,6 +20,7 @@ jobs: if: github.repository == 'stackhpc/stackhpc-kayobe-config' outputs: aio: ${{ steps.changes.outputs.aio }} + check-tags: ${{ steps.changes.outputs.check-tags }} steps: - name: GitHub Checkout uses: actions/checkout@v4 @@ -79,12 +80,14 @@ jobs: check-tags: name: Check container image tags needs: + - check-changes - build-kayobe-image uses: ./.github/workflows/stackhpc-check-tags.yml with: kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }} + if: ${{ needs.check-changes.outputs.check-tags == 'true' }} secrets: inherit - if: github.repository == 'stackhpc/stackhpc-kayobe-config' + if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} all-in-one-ubuntu-jammy-ovs: name: aio (Ubuntu Jammy OVS) diff --git a/etc/kayobe/ansible/check-tags.yml b/etc/kayobe/ansible/check-tags.yml index 3f0d22a68..dc429a7cd 100644 --- a/etc/kayobe/ansible/check-tags.yml +++ b/etc/kayobe/ansible/check-tags.yml @@ -16,10 +16,6 @@ set_fact: kolla_images: "{{ kolla_images_result.stdout | from_yaml }}" - - name: Set a fact about the Pulp URL - set_fact: - pulp_url: "{{ stackhpc_repo_mirror_url }}" - # Use state=read and allow_missing=false to check for missing tags in test pulp. - import_role: name: stackhpc.pulp.pulp_container_content @@ -30,6 +26,7 @@ {%- set repository = kolla_docker_namespace ~ "/" ~ image -%} {%- set content = { "allow_missing": False, + "is_push": pulp_url == stackhpc_release_pulp_url, "repository": repository, "state": "read", "tags": tags, diff --git a/etc/kayobe/ansible/requirements.yml b/etc/kayobe/ansible/requirements.yml index 0bae52204..97086fd7e 100644 --- a/etc/kayobe/ansible/requirements.yml +++ b/etc/kayobe/ansible/requirements.yml @@ -7,7 +7,7 @@ collections: - name: pulp.squeezer version: 0.0.13 - name: stackhpc.pulp - version: 0.5.4 + version: 0.5.5 - name: stackhpc.hashicorp version: 2.4.0 - name: stackhpc.kayobe_workflows