X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjenkins-configure-clouds.sh;h=ed1a30c09c51cd995f1c04564555d5ac98dd3703;hb=refs%2Fchanges%2F66%2F72766%2F1;hp=cc6a4eec500d0f1503856c4643971da15e0caaf4;hpb=b478f21f36b3ff13d9508bb8c0f71890d4c96938;p=releng%2Fglobal-jjb.git

diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh
index cc6a4eec..ed1a30c0 100644
--- a/shell/jenkins-configure-clouds.sh
+++ b/shell/jenkins-configure-clouds.sh
@@ -49,13 +49,13 @@ set -eu -o pipefail
 testversion() {
     local current_val="$1" operator="$2" test_value="$3"
     awk -vv1="$current_val" -vv2="$test_value" 'BEGIN {
-      split(v1, a, /\:/);
-      if (a[2] == '"$test_value"') {
-        exit (a[2] == '"$test_value"') ? 0 : 1
-      }
-      else {
-        exit (a[2] '"$operator"' '"$test_value"') ? 0 : 1
-      }
+        split(v1, a, /\:/);
+        if (a[2] == '"$test_value"') {
+            exit (a[2] == '"$test_value"') ? 0 : 1
+        }
+        else {
+            exit (a[2] '"$operator"' '"$test_value"') ? 0 : 1
+        }
     }'
 }
 
@@ -192,6 +192,14 @@ get_minion_options() {
     flavors["v3-standard-48"]="06a0e8b7-949a-439d-a185-208ae9e645b2"
     flavors["v3-standard-64"]="402a2759-cc01-481d-a8b7-2c7056f153f7"
     flavors["v3-standard-96"]="883b0564-dec6-4e51-88c7-83d86994fcf0"
+    flavors["v3-starter-2"]="b542cedb-d3b4-4446-a43f-5416711440ee"
+    flavors["v3-starter-4"]="5f93acce-e8dc-482b-9118-134728a77aa8"
+    flavors["v3-starter-8"]="35c0ddb3-4dd8-478c-887c-34620851a66a"
+    flavors["v3-starter-16"]="595dd716-6c7a-4365-9020-2ff10796e29c"
+    flavors["v3-starter-32"]="15949005-7952-4e93-be69-ca89dab5b884"
+    flavors["v3-starter-48"]="94eb4cec-3840-4171-ad50-a8bce2757d11"
+    flavors["v3-starter-64"]="4a6e52a2-8f64-4632-adde-72f81616d4f9"
+    flavors["v3-starter-96"]="8e7205fc-3ec7-456c-bff0-e38609e415c1"
 
     image_name=$(get_cfg "$cfg_file" IMAGE_NAME "")
     volume_size=$(get_cfg "$cfg_file" VOLUME_SIZE "")
@@ -237,11 +245,11 @@ get_minion_options() {
     # Handle specifying the minimum instance count across different versions
     if testversion "$os_plugin_version" '>=' '2.47'
     then
-      instance_min=$(get_cfg "$cfg_file" INSTANCE_MIN "null")
-      echo "    $instance_min,"
+        instance_min=$(get_cfg "$cfg_file" INSTANCE_MIN "null")
+        echo "    $instance_min,"
     else
-      instance_min=$(get_cfg "$cfg_file" INSTANCE_MIN_CAPMAX "null")
-      echo "    $instance_min,"
+        instance_min=$(get_cfg "$cfg_file" INSTANCE_MIN_CAPMAX "null")
+        echo "    $instance_min,"
     fi
 
     echo "    \"$floating_ip_pool\","
@@ -256,11 +264,11 @@ get_minion_options() {
 
     if testversion "$os_plugin_version" '>=' '2.47'
     then
-      echo "    $node_properties,"
-      echo "    $retention_time",
-      echo "    $config_drive"
+        echo "    $node_properties,"
+        echo "    $retention_time",
+        echo "    $config_drive"
     else
-      echo "    $retention_time"
+        echo "    $retention_time"
     fi
 
 
@@ -292,6 +300,10 @@ get_template_cfg() {
     echo ")"
 }
 
+# shellcheck disable=SC1090
+. ~/lf-env.sh
+
+lf-activate-venv --python python3 lftools
 
 mapfile -t clouds < <(ls -d1 "$OS_CLOUD_DIR"/*/)
 
@@ -322,7 +334,7 @@ for silo in $silos; do
     # JENKINS_{URL,USER,PASSWORD} env vars are required for the "lftools jenkins
     # plugins list" call
     os_plugin_version="$(lftools jenkins plugins list \
-      | grep -i 'OpenStack Cloud Plugin')"
+        | grep -i 'OpenStack Cloud Plugin')"
 
     echo "-----> Groovy script $script_file"
     for cloud in "${clouds[@]}"; do