X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjenkins-configure-clouds.sh;h=456b825af16ce1cec62b19937ff24b097836723a;hb=d8e3dc493b1ba8b5a462887c6fa90a51c86bedc2;hp=336c7210bd7b6f71e20dce7b24a5184e18b69005;hpb=948b602b0db6022328c5ecaf3d2dfcc0a36b5a61;p=releng%2Fglobal-jjb.git

diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh
index 336c7210..456b825a 100644
--- a/shell/jenkins-configure-clouds.sh
+++ b/shell/jenkins-configure-clouds.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2018 The Linux Foundation and others.
@@ -102,6 +102,24 @@ get_cloud_cfg() {
     echo ")"
 }
 
+get_launcher_factory() {
+    if [ -z $1 ]; then
+        >&2 echo "Usage: get_launcher_factory JNLP|SSH"
+        exit 1
+    fi
+
+    local connection_type="$1"
+
+    if [ "$connection_type" == "JNLP" ]; then
+        echo "new LauncherFactory.JNLP()"
+    elif [ "$connection_type" == "SSH" ]; then
+        echo "new LauncherFactory.SSH(\"$key_pair_name\", \"\")"
+    else
+        >&2 echo "Unknown connection type $connection_type"
+        exit 1
+    fi
+}
+
 get_minion_options() {
     if [ -z $1 ]; then
         >&2 echo "Usage: get_minion_options CFG_FILE"
@@ -148,7 +166,9 @@ get_minion_options() {
     volume_size=$(get_cfg "$cfg_file" VOLUME_SIZE "")
     hardware_id=$(get_cfg "$cfg_file" HARDWARE_ID "")
     network_id=$(get_cfg "$cfg_file" NETWORK_ID "")
-    user_data_id=$(get_cfg "$cfg_file" USER_DATA_ID "jenkins-init-script")
+
+    udi_default="$(get_cfg "$(dirname $cfg_file)/cloud.cfg" USER_DATA_ID "jenkins-init-script")"
+    user_data_id=$(get_cfg "$cfg_file" USER_DATA_ID "$udi_default")
 
     # Handle Sandbox systems that might have a different cap.
     instance_cap=$(get_cfg "$cfg_file" INSTANCE_CAP "null")
@@ -161,14 +181,20 @@ get_minion_options() {
     security_groups=$(get_cfg "$cfg_file" SECURITY_GROUPS "default")
     availability_zone=$(get_cfg "$cfg_file" AVAILABILITY_ZONE "")
     start_timeout=$(get_cfg "$cfg_file" START_TIMEOUT "600000")
-    key_pair_name=$(get_cfg "$cfg_file" KEY_PAIR_NAME "jenkins-ssh")
+
+    kpn_default="$(get_cfg "$(dirname $cfg_file)/cloud.cfg" KEY_PAIR_NAME "jenkins-ssh")"
+    key_pair_name=$(get_cfg "$cfg_file" KEY_PAIR_NAME "$kpn_default")
+
     num_executors=$(get_cfg "$cfg_file" NUM_EXECUTORS "1")
     jvm_options=$(get_cfg "$cfg_file" JVM_OPTIONS "")
     fs_root=$(get_cfg "$cfg_file" FS_ROOT "/w")
     retention_time=$(get_cfg "$cfg_file" RETENTION_TIME "0")
+    connection_type=$(get_cfg "$cfg_file" CONNECTION_TYPE "SSH")
+    launcher_factory=$(get_launcher_factory "$connection_type")
 
     OS_PLUGIN_VER="$(lftools jenkins plugins list \
-        | grep -i 'OpenStack Cloud Plugin' | awk -F':' '{print $2}')"
+        | grep -i 'OpenStack Cloud Plugin' \
+        | awk -F':' '{print $2}' | awk -F' ' '{print $1}')"
     if version_ge "$OS_PLUGIN_VER" "2.35"; then
         if [ ! -z "$volume_size" ]; then
             echo "    new BootSource.VolumeFromImage(\"$image_name\", $volume_size),"
@@ -188,7 +214,7 @@ get_minion_options() {
         echo "    $num_executors,"
         echo "    \"$jvm_options\","
         echo "    \"$fs_root\","
-        echo "    new LauncherFactory.SSH(\"$key_pair_name\", \"\"),"
+        echo "    $launcher_factory,"
         echo "    $retention_time"
 
     else  # SlaveOptions() structure for versions <= 2.34
@@ -209,7 +235,7 @@ get_minion_options() {
         echo "    $num_executors,"
         echo "    \"$jvm_options\","
         echo "    \"$fs_root\","
-        echo "    new LauncherFactory.SSH(\"$key_pair_name\", \"\"),"
+        echo "    $launcher_factory,"
         echo "    $retention_time"
     fi
 }