Skip to content

Commit 072c57a

Browse files
authored
Merge pull request #12 from stackhpc/fix-kayobe-image-matrix
fix: matrix issue when using shared registry
2 parents c1606d4 + 4ddd9f7 commit 072c57a

File tree

3 files changed

+3
-22
lines changed

3 files changed

+3
-22
lines changed

roles/github/meta/main.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

roles/github/templates/build-kayobe-docker-image.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%- if github_environment_selector == 'input' -%>
1+
<%- if github_environment_selector == 'input' and (github_registry.share | default(github_default_registry.share)) is false -%>
22
<%- set github_runs_on = github_runs_on + ['${{ matrix.environment }}'] -%>
33
<%- set _ = github_default_registry.update({"url": "${{ vars[format('{0}_REGISTRY_URL', matrix.environment)] }}" }) -%>
44
<%- set _ = github_default_registry.update({"username": "${{ vars[format('{0}_REGISTRY_USERNAME', matrix.environment)] }}" }) -%>

tests/inventory/host_vars/reference.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ github_runs_on:
1616
github_registry:
1717
url: pulp.infra.os.example.cloud
1818
username: admin
19-
password: ${{ secrets.REGISTRY_PASSWORD }}
19+
password: !unsafe ${{ secrets.REGISTRY_PASSWORD }}
20+
share: true
2021

2122
github_kayobe_arguments:
2223
KAYOBE_VAULT_PASSWORD: !unsafe "${{ secrets.KAYOBE_VAULT_PASSWORD }}"

0 commit comments

Comments
 (0)