File tree Expand file tree Collapse file tree 5 files changed +10
-47
lines changed
Expand file tree Collapse file tree 5 files changed +10
-47
lines changed Original file line number Diff line number Diff line change @@ -79,16 +79,16 @@ jobs:
7979 - name : Output image tag
8080 id : image_tag
8181 run : |
82- echo ::set-output name= image_tag:: $(grep stackhpc_${{ inputs.os_distribution }}_${{ inputs.os_release }}_overcloud_host_image_version etc/kayobe/environments/ci-aio/stackhpc-ci.yml | awk '{print $2}')
82+ echo image_tag= $(grep stackhpc_${{ inputs.os_distribution }}_${{ inputs.os_release }}_overcloud_host_image_version etc/kayobe/environments/ci-aio/stackhpc-ci.yml | awk '{print $2}') >> $GITHUB_OUTPUT
8383
8484 # Use the image override if set, otherwise use overcloud-os_distribution-os_release-tag
8585 - name : Output image name
8686 id : image_name
8787 run : |
8888 if [ -z "${{ inputs.vm_image_override }}" ]; then
89- echo ::set-output name= image_name:: overcloud-${{ inputs.os_distribution }}-${{ inputs.os_release }}-${{ steps.image_tag.outputs.image_tag }}
89+ echo image_name= overcloud-${{ inputs.os_distribution }}-${{ inputs.os_release }}-${{ steps.image_tag.outputs.image_tag }} >> $GITHUB_OUTPUT
9090 else
91- echo ::set-output name= image_name:: ${{ inputs.vm_image_override }}
91+ echo image_name= ${{ inputs.vm_image_override }} >> $GITHUB_OUTPUT
9292 fi
9393
9494 - name : Install terraform
@@ -268,13 +268,6 @@ jobs:
268268 run : |
269269 test $(wc -l < tempest-artifacts/failed-tests) -lt 1
270270
271- - name : Upload logs artifact
272- uses : actions/upload-artifact@v3
273- with :
274- name : kolla-logs-${{ inputs.os_distribution }}-${{ inputs.os_release }}-${{ inputs.neutron_plugin }}
275- path : logs.zip
276- if : failure()
277-
278271 - name : Destroy
279272 run : terraform destroy -auto-approve
280273 working-directory : ${{ github.workspace }}/terraform/aio
Original file line number Diff line number Diff line change 7575 os_distribution : rocky
7676 os_release : " 8"
7777 neutron_plugin : ovs
78- # NOTE: The current SMS lab Rocky8 image has moved ahead of our release
79- # train snapshots, causing failures installing some packages.
8078 OS_CLOUD : sms-lab-release
8179 secrets : inherit
8280 if : github.repository == 'stackhpc/stackhpc-kayobe-config'
@@ -91,14 +89,12 @@ jobs:
9189 os_distribution : rocky
9290 os_release : " 8"
9391 neutron_plugin : ovn
94- # NOTE: The current SMS lab Rocky8 image has moved ahead of our release
95- # train snapshots, causing failures installing some packages.
9692 OS_CLOUD : sms-lab-release
9793 secrets : inherit
9894 if : github.repository == 'stackhpc/stackhpc-kayobe-config'
9995
100- all-in-one-ubuntu-focal- ovs :
101- name : aio (Ubuntu Focal OVS)
96+ all-in-one-ubuntu-ovs :
97+ name : aio (Ubuntu OVS)
10298 needs :
10399 - build-kayobe-image
104100 uses : ./.github/workflows/stackhpc-all-in-one.yml
@@ -112,8 +108,8 @@ jobs:
112108 secrets : inherit
113109 if : github.repository == 'stackhpc/stackhpc-kayobe-config'
114110
115- all-in-one-ubuntu-focal- ovn :
116- name : aio (Ubuntu Focal OVN)
111+ all-in-one-ubuntu-ovn :
112+ name : aio (Ubuntu OVN)
117113 needs :
118114 - build-kayobe-image
119115 uses : ./.github/workflows/stackhpc-all-in-one.yml
Original file line number Diff line number Diff line change @@ -83,7 +83,7 @@ stackhpc_docker_registry_password: !vault |
8383
8484# Overcloud host image tags
8585stackhpc_centos_8-stream_overcloud_host_image_version : " yoga-20230525T095243"
86- stackhpc_rocky_8_overcloud_host_image_version : " yoga-20230524T084837 "
86+ stackhpc_rocky_8_overcloud_host_image_version : " yoga-20230629T135322 "
8787stackhpc_rocky_9_overcloud_host_image_version : " yoga-20230515T145140"
8888stackhpc_ubuntu_focal_overcloud_host_image_version : " yoga-20230609T120720"
8989stackhpc_ubuntu_jammy_overcloud_host_image_version : " yoga-20230609T120720"
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -73,6 +73,8 @@ resource "null_resource" "kayobe-aio" {
7373 host = openstack_compute_instance_v2. kayobe-aio . access_ip_v4
7474 user = var. ssh_username
7575 private_key = file (" id_rsa" )
76+ # Terraform will run the start script from /tmp by default. For the
77+ # current images, /tmp is noexec, so the path must be changed
7678 script_path = " /home/${ var . ssh_username } /start.sh"
7779 }
7880
You can’t perform that action at this time.
0 commit comments