Merge branch 'fix-knightly-flavor' into 'main'

Setup knightly instance flavor

Closes #74

See merge request rc/packer-openstack-hpc-image!49

.gitlab-ci.yml

@@ -116,13 +116,14 @@ build_image:
     - |
       if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
         export PKR_VAR_image_name="ood-PR-${CI_MERGE_REQUEST_IID}"
+        echo INSTANCE_FLAVOR="m1.small" | tee -a $CI_PROJECT_DIR/image.env
         echo OOD_INSTANCE_NAME="ood-PR-${CI_MERGE_REQUEST_IID}" | tee -a $CI_PROJECT_DIR/image.env
         export FLOATING_IP=$(openstack floating ip create uab-campus -f value -c floating_ip_address)
         echo FLOATING_IP=$FLOATING_IP | tee -a $CI_PROJECT_DIR/image.env
         sed -i -E "s/(ood_servername: ).*/\1\"$CI_COMMIT_REF_SLUG.$FLOATING_IP.nip.io\"/" CRI_XCBC/group_vars/knightly
       elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
         export PKR_VAR_image_name="ood-${BUILD_DATE}"
-        export PKR_VAR_flavor="cpu16-64g"
+        echo INSTANCE_FLAVOR="cpu16-64g" | tee -a $CI_PROJECT_DIR/image.env
         echo OOD_INSTANCE_NAME="ood-knightly" | tee -a $CI_PROJECT_DIR/image.env
         echo FLOATING_IP=$TEST_IP | tee -a $CI_PROJECT_DIR/image.env
       fi
@@ -175,7 +176,7 @@ test:
       --security-group ood-https-ports
       --security-group allow-ssh
       --user-data user_data.txt
-      --flavor $PKR_VAR_flavor
+      --flavor $INSTANCE_FLAVOR
       --wait
       $OOD_INSTANCE_NAME)
     - echo NEW_INSTANCE_ID=$NEW_INSTANCE_ID | tee -a instance.env