Skip to content

Commit ecfbe44

Browse files
Apply suggestions from code review
Co-authored-by: Alex-Welsh <[email protected]>
1 parent 8cf9f60 commit ecfbe44

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

roles/gitlab/defaults/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ gitlab_merge_request_kolla_diff: |
133133
when: always
134134
parallel:
135135
matrix:
136-
- KAYOBE_ENVIRONMENT: [production, test]
136+
- KAYOBE_ENVIRONMENT: {{ gitlab_kayobe_environments }}
137137
script:
138138
- !reference [.get_secrets, script]
139139
- .automation/pipeline/config-diff.sh origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
@@ -597,7 +597,7 @@ gitlab_runbook_in_place_hypervisor_host_upgrade_drain_hypervisor: |
597597
- !reference [.active_stage_web_rule_no_manual, rules]
598598
stage: runbook-in-place-hypervisor-host-upgrade
599599
resource_group: runbook-in-place-hypervisor-host-upgrade
600-
needs: [disable_compute_services]
600+
needs: [a_disable_compute_services]
601601
script:
602602
- !reference [.kayobe_public_openrc, script]
603603
- !reference [.get_secrets, script]
@@ -608,7 +608,7 @@ gitlab_runbook_in_place_hypervisor_host_upgrade_package_update: |
608608
rules:
609609
- !reference [.active_stage_web_rule_no_manual, rules]
610610
stage: runbook-overcloud-service-upgrade
611-
resource_group: runbook-overcloud-service-upgrade
611+
resource_group: runbook-in-place-hypervisor-host-upgrade
612612
needs: [b_drain_hypervisor]
613613
script:
614614
- !reference [overcloud_host_package_update, script]

roles/gitlab/templates/prelude.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ default:
8585
export BAO_TOKEN=$(curl --silent --request POST
8686
--data '{"role": "gitlab", "jwt": "'"$VAULT_AUTH_TOKEN"'"}'
8787
http://127.0.0.1:8200/v1/auth/jwt/login | jq -r '.auth.client_token')
88+
- mkdir -p $HOME/.docker
89+
- echo $DOCKER_AUTH_CONFIG > $HOME/.docker/config.json
8890

8991
.kayobe_automation_ssh_private_key: &kayobe_automation_ssh_private_key
9092
- >-

0 commit comments

Comments
 (0)