@@ -19,7 +19,7 @@ gitlab_tempest_test_suites: |
1919
2020gitlab_openstack_release : " 2024.1"
2121
22- gitlab_stages : " {{ gitlab_default_stages | combine(gitlab_extra_stages) | combine(gitlab_runbooks) }}"
22+ gitlab_stages : " {{ gitlab_default_stages | combine(gitlab_extra_stages) | combine(gitlab_runbooks) | combine(gitlab_upstream_stages) }}"
2323
2424gitlab_default_stages :
2525 build :
@@ -44,10 +44,24 @@ gitlab_runbooks: "{{ gitlab_default_runbooks | combine(gitlab_extra_runbooks) }}
4444gitlab_default_runbooks :
4545 runbook-overcloud-service-upgrade :
4646 " {{ gitlab_runbook_overcloud_service_upgrade }}"
47+
48+ gitlab_extra_runbooks : {}
49+
50+ gitlab_upstream_stages : " {{ gitlab_default_upstream_stages | combine(gitlab_extra_upstream_stages) }}"
51+
52+ gitlab_default_upstream_stages :
53+ upstream-runbook-in-place-hypervisor-host-upgrade :
54+ " {{ gitlab_upstream_runbook_in_place_hypervisor_host_upgrade }}"
55+
56+ gitlab_extra_upstream_stages : {}
57+
58+ gitlab_downstream_stages : " {{ gitlab_default_downstream_stages | combine(gitlab_extra_downstream_stages) }}"
59+
60+ gitlab_default_downstream_stages :
4761 runbook-in-place-hypervisor-host-upgrade :
4862 " {{ gitlab_runbook_in_place_hypervisor_host_upgrade }}"
4963
50- gitlab_extra_runbooks : {}
64+ gitlab_extra_downstream_stages : {}
5165
5266gitlab_stage_build : " {{ gitlab_stage_build_default | combine(gitlab_stage_build_extra) }}"
5367
@@ -590,7 +604,6 @@ gitlab_runbook_in_place_hypervisor_host_upgrade_disable_compute_services: |
590604 - !reference [.kayobe_public_openrc, script]
591605 - !reference [.get_secrets, script]
592606 - .automation/pipeline/playbook-run.sh etc/kayobe/ansible/nova-compute-disable.yml
593- allow_failure: true
594607
595608gitlab_runbook_in_place_hypervisor_host_upgrade_drain_hypervisor : |
596609 rules:
@@ -602,7 +615,6 @@ gitlab_runbook_in_place_hypervisor_host_upgrade_drain_hypervisor: |
602615 - !reference [.kayobe_public_openrc, script]
603616 - !reference [.get_secrets, script]
604617 - .automation/pipeline/playbook-run.sh etc/kayobe/ansible/nova-compute-disable.yml
605- allow_failure: true
606618
607619gitlab_runbook_in_place_hypervisor_host_upgrade_package_update : |
608620 rules:
@@ -623,7 +635,6 @@ gitlab_runbook_in_place_hypervisor_reboot_hypervisor: |
623635 - !reference [.kayobe_public_openrc, script]
624636 - !reference [.get_secrets, script]
625637 - .automation/pipeline/playbook-run.sh etc/kayobe/ansible/reboot.yml
626- allow_failure: true
627638
628639gitlab_runbook_in_place_hypervisor_host_upgrade_enable_hypervisor : |
629640 rules:
@@ -635,4 +646,33 @@ gitlab_runbook_in_place_hypervisor_host_upgrade_enable_hypervisor: |
635646 - !reference [.kayobe_public_openrc, script]
636647 - !reference [.get_secrets, script]
637648 - .automation/pipeline/playbook-run.sh etc/kayobe/ansible/nova-compute-disable.yml
638- allow_failure: true
649+
650+ gitlab_upstream_runbook_in_place_hypervisor_host_upgrade :
651+ a_constructor : " {{ gitlab_upstream_runbook_in_place_hypervisor_host_upgrade_constructor }}"
652+ b_executor : " {{ gitlab_upstream_runbook_in_place_hypervisor_host_upgrade_executor }}"
653+
654+ gitlab_upstream_runbook_in_place_hypervisor_host_upgrade_constructor : |
655+ rules:
656+ - !reference [.active_stage_web_rule, rules]
657+ stage: upstream-runbook-in-place-hypervisor-host-upgrade
658+ script:
659+ - !reference [.kayobe_public_openrc, script]
660+ - !reference [.get_secrets, script]
661+ - .automation/pipeline/playbook-run.sh etc/kayobe/ansible/write-gitlab-pipeline.yml \
662+ -t runbook_in_place_hypervisor_host_upgrade_trigger \
663+ -e kayobe_automation_upgrade_group_name=$KAYOBE_AUTOMATION_UPGRADE_GROUP_NAME \
664+ -e kayobe_automation_upgrade_batch_size=$KAYOBE_AUTOMATION_UPGRADE_BATCH_SIZE
665+ artifacts:
666+ name: runbook-in-place-hypervisor-host-upgrade-trigger.yml
667+ expire_in: 1 hrs
668+ when: always
669+ paths:
670+ - .gitlab/runbook-in-place-hypervisor-host-upgrade-trigger.yml
671+
672+ gitlab_upstream_runbook_in_place_hypervisor_host_upgrade_executor : |
673+ stage: upstream-runbook-in-place-hypervisor-host-upgrade
674+ needs: [a_constructor]
675+ trigger:
676+ include:
677+ - artifact: runbook-in-place-hypervisor-host-upgrade-trigger.yml
678+ job: gitlab_runbook_in_place_hypervisor_host_upgrade_constructor
0 commit comments