From 27ebaa5fd65d6e940b9fa3aa9cd3ebb4543aef6b Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Thu, 15 Feb 2024 10:20:22 +0000 Subject: [PATCH 1/3] Set kolla_build_neutron_ovs to true if regex empty --- .github/workflows/stackhpc-container-image-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml index b8afea93e..af9b3cc79 100644 --- a/.github/workflows/stackhpc-container-image-build.yml +++ b/.github/workflows/stackhpc-container-image-build.yml @@ -171,6 +171,9 @@ jobs: if ${{ inputs.push }} == 'true'; then args="$args --push" fi + if [[ ${{ github.event.inputs.regexes }} == "" ]]; then + args="$args -e kolla_build_neutron_ovs=true" + fi source venvs/kayobe/bin/activate && source src/kayobe-config/kayobe-env --environment ci-builder && kayobe overcloud container image build $args From a9a39806b1fa10d2321d34452fbe00bbe50b0136 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Wed, 21 Feb 2024 13:30:00 +0000 Subject: [PATCH 2/3] Add missing quotes --- .github/workflows/stackhpc-container-image-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml index af9b3cc79..be09f8b4f 100644 --- a/.github/workflows/stackhpc-container-image-build.yml +++ b/.github/workflows/stackhpc-container-image-build.yml @@ -171,7 +171,7 @@ jobs: if ${{ inputs.push }} == 'true'; then args="$args --push" fi - if [[ ${{ github.event.inputs.regexes }} == "" ]]; then + if [[ "${{ github.event.inputs.regexes }}" == "" ]]; then args="$args -e kolla_build_neutron_ovs=true" fi source venvs/kayobe/bin/activate && From 2249baf6d3c76bfa9940b927fc7e7571c5902fdd Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Wed, 21 Feb 2024 15:14:43 +0000 Subject: [PATCH 3/3] Change the variable definition location --- .github/workflows/stackhpc-container-image-build.yml | 3 --- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml index be09f8b4f..b8afea93e 100644 --- a/.github/workflows/stackhpc-container-image-build.yml +++ b/.github/workflows/stackhpc-container-image-build.yml @@ -171,9 +171,6 @@ jobs: if ${{ inputs.push }} == 'true'; then args="$args --push" fi - if [[ "${{ github.event.inputs.regexes }}" == "" ]]; then - args="$args -e kolla_build_neutron_ovs=true" - fi source venvs/kayobe/bin/activate && source src/kayobe-config/kayobe-env --environment ci-builder && kayobe overcloud container image build $args diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 868668e33..27ac8d858 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -29,6 +29,7 @@ kolla_enable_ovn: true kolla_enable_prometheus: true kolla_enable_redis: true kolla_enable_skydive: true +kolla_build_neutron_ovs: true ############################################################################### # StackHPC configuration.