-#!/bin/bash
+#!/bin/bash -l
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2018 The Linux Foundation and others.
#
# export WORKSPACE=/tmp/ci-management
# export jenkins_silos=sandbox
-# bash ./jjb/global-jjb/shell/jenkins-configure-clouds.sh
+# bash ./global-jjb/shell/jenkins-configure-clouds.sh
echo "---> jenkins-configure-clouds.sh"
if [ ! -d "$WORKSPACE/jenkins-config/clouds" ]; then
exit 0
fi
-#shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
-source "/tmp/v/lftools/bin/activate"
-
-GROOVY_SCRIPT_FILE="jjb/global-jjb/jenkins-admin/manage_clouds.groovy"
+GROOVY_SCRIPT_FILE="global-jjb/jenkins-admin/manage_clouds.groovy"
OS_CLOUD_DIR="$WORKSPACE/jenkins-config/clouds/openstack"
SCRIPT_DIR="$WORKSPACE/archives/groovy-inserts"
mkdir -p "$SCRIPT_DIR"
silos="${jenkins_silos:-jenkins}"
-set +x # Disable `set -x` to prevent printing passwords
-echo "Configuring $silo"
-JENKINS_URL=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" url)
-JENKINS_USER=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" user)
-JENKINS_PASSWORD=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" password)
-export JENKINS_URL
-export JENKINS_USER
-export JENKINS_PASSWORD
-OS_PLUGIN_VER="$(lftools jenkins plugins list \
- | grep 'Openstack Cloud Plugin' | awk -F':' '{print $2}')"
-
set -eu -o pipefail
version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
export get_cfg
get_cloud_cfg() {
- if [ -z $1 ]; then
+ if [ -z "$1" ]; then
>&2 echo "Usage: get_cloud_cfg CFG_DIR"
exit 1
fi
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
+ if [ -z "$1" ]; then
>&2 echo "Usage: get_minion_options CFG_FILE"
exit 1
fi
# Create a flavor mapping to manage hardware_id until OpenStack Cloud
# plugin supports using names
declare -A flavors
+ # ShellCheck 0.4.4 incorrectly flags these as unused vars
+ # Fails on first instance of each different associatve array prefix
+ # Fails when using single/double/no quotes, all of which are valid bash
+ # shellcheck disable=SC2154
+ flavors["acumos-highcpu-4-avx"]="c720c1f8-62e9-4695-823d-f7f54db46c86"
+ flavors["lf-highcpu-2"]="1051d06a-61ea-45e3-b9b4-93de92880b27"
+ flavors["lf-highcpu-4"]="35eb8e11-490f-4d1a-9f19-76091fc04547"
+ flavors["lf-highcpu-8"]="68af673f-54ee-4255-871c-158c18e4f643"
+ flavors["lf-standard-1"]="7d76cbb0-f547-4c2c-beaf-554f33832721"
+ flavors["lf-standard-2"]="ef454088-7839-42a0-bf23-5e0ab6386a27"
+ flavors["lf-standard-4"]="bd74e1e6-c2ed-475b-ab3f-2ce13936a215"
+ flavors["lf-standard-8"]="32d74024-8418-41b6-9675-b77816748148"
+ # shellcheck disable=SC2154
+ flavors["odl-highcpu-2"]="def1b86f-b7f8-4943-b430-4a0599170006"
+ flavors["odl-highcpu-4"]="0c8ec795-2ff8-4623-98cf-b4c1d92bb37c"
+ flavors["odl-highcpu-8"]="458d6499-e2c8-4580-aa88-a4a04a33ee25"
+ flavors["odl-standard-1"]="35800a3f-0c69-428d-b5cb-136d17d46c48"
+ flavors["odl-standard-2"]="8ead227a-acfe-4290-be70-fbab92e6dd2f"
+ flavors["odl-standard-4"]="f76fb18d-d5fb-4175-95c1-b29d8039d102"
+ flavors["odl-standard-8"]="ba38b1af-4f87-4e4e-860e-94e8329d0d78"
+ # shellcheck disable=SC2154
flavors["v1-standard-1"]="bbcb7eb5-5c8d-498f-9d7e-307c575d3566"
flavors["v1-standard-2"]="ca2a6e9c-2236-4107-8905-7ae9427132ff"
flavors["v1-standard-4"]="5cf64088-893b-46b5-9bb1-ee020277635d"
flavors["v1-standard-64"]="0c1d9008-f546-4608-9e8f-f8bdaec8dddd"
flavors["v1-standard-96"]="5741c775-92a4-4488-bd77-dd7b08e2be81"
flavors["v1-standard-128"]="e82d0a5b-8031-4526-9a5d-a15f7b4d48ff"
- flavors["v2-standard-1"]="52a01f6b-e660-48b5-8c06-5fb2a0fab0ec"
- flavors["v2-standard-2"]="ac2c4d17-8d6f-4e3c-a9eb-57c155f0a949"
- flavors["v2-standard-4"]="d9115351-defe-4fac-986b-1a1187e2c31c"
- flavors["v2-standard-8"]="e6fe2e37-0e38-438c-8fa5-fc2d79d0a7bb"
- flavors["v2-standard-16"]="9e4b01cd-6744-4120-aafe-1b5e17584919"
- flavors["v2-standard-360"]="f0d27f44-a410-4f0f-9781-d722f5b5489e"
+ # shellcheck disable=SC2154
flavors["v2-highcpu-1"]="c04abb7a-2b61-4ed3-8ce8-6c40ad9df750"
flavors["v2-highcpu-2"]="03bdf34e-8905-46bc-a4b9-8dbf94b6e06d"
flavors["v2-highcpu-4"]="3b72e578-7875-4e0e-91b7-71ed292f3ca2"
flavors["v2-highcpu-8"]="221de281-95ec-414f-8e42-c86c9e0b318d"
flavors["v2-highcpu-16"]="ddd6863a-ef4f-475c-9aee-61d46898651d"
flavors["v2-highcpu-32"]="21dfb8a3-c472-4a2c-a8e1-4da8de415ff8"
- flavors["odl-highcpu-2"]="def1b86f-b7f8-4943-b430-4a0599170006"
- flavors["odl-highcpu-4"]="0c8ec795-2ff8-4623-98cf-b4c1d92bb37c"
- flavors["odl-highcpu-8"]="458d6499-e2c8-4580-aa88-a4a04a33ee25"
- flavors["odl-standard-1"]="35800a3f-0c69-428d-b5cb-136d17d46c48"
- flavors["odl-standard-2"]="8ead227a-acfe-4290-be70-fbab92e6dd2f"
- flavors["odl-standard-4"]="f76fb18d-d5fb-4175-95c1-b29d8039d102"
- flavors["odl-standard-8"]="ba38b1af-4f87-4e4e-860e-94e8329d0d78"
+ flavors["v2-standard-1"]="52a01f6b-e660-48b5-8c06-5fb2a0fab0ec"
+ flavors["v2-standard-2"]="ac2c4d17-8d6f-4e3c-a9eb-57c155f0a949"
+ flavors["v2-standard-4"]="d9115351-defe-4fac-986b-1a1187e2c31c"
+ flavors["v2-standard-8"]="e6fe2e37-0e38-438c-8fa5-fc2d79d0a7bb"
+ flavors["v2-standard-16"]="9e4b01cd-6744-4120-aafe-1b5e17584919"
+ flavors["v2-standard-360"]="f0d27f44-a410-4f0f-9781-d722f5b5489e"
image_name=$(get_cfg "$cfg_file" IMAGE_NAME "")
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")
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}' | awk -F' ' '{print $1}')"
if version_ge "$OS_PLUGIN_VER" "2.35"; then
- if [ ! -z "$volume_size" ]; then
+ if [ -n "$volume_size" ]; then
echo " new BootSource.VolumeFromImage(\"$image_name\", $volume_size),"
else
echo " new BootSource.Image(\"$image_name\"),"
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
- if [ ! -z "$volume_size" ]; then
+ if [ -n "$volume_size" ]; then
echo " new BootSource.VolumeFromImage(\"$image_name\", $volume_size),"
else
echo " new BootSource.Image(\"$image_name\"),"
echo " $num_executors,"
echo " \"$jvm_options\","
echo " \"$fs_root\","
- echo " new LauncherFactory.SSH(\"$key_pair_name\", \"\"),"
+ echo " $launcher_factory,"
echo " $retention_time"
fi
}
get_template_cfg() {
- if [ -z $1 ]; then
- >&2 echo "Usage: get_template_cfg CFG_FILE"
+ if [ -z "$2" ]; then
+ >&2 echo "Usage: get_template_cfg CFG_FILE SILO [MINION_PREFIX]"
exit 1
fi
local cfg_file="$1"
- local minion_prefix="${2:-}"
+ local silo="${2}"
+ local minion_prefix="${3:-}"
+
- template_name=$(basename $cfg_file .cfg)
+ template_name=$(basename "$cfg_file" .cfg)
labels=$(get_cfg "$cfg_file" LABELS "")
echo "minion_options = new SlaveOptions("
- get_minion_options "$cfg_file"
+ get_minion_options "$cfg_file" "$silo"
echo ")"
echo "template = new JCloudsSlaveTemplate("
echo ")"
}
-mapfile -t clouds < <(ls -d1 $OS_CLOUD_DIR/*/)
+mapfile -t clouds < <(ls -d1 "$OS_CLOUD_DIR"/*/)
for silo in $silos; do
node_prefix="${silo}-"
fi
+ set +x # Disable `set -x` to prevent printing passwords
+ echo "Configuring $silo"
+ JENKINS_URL=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" url)
+ JENKINS_USER=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" user)
+ JENKINS_PASSWORD=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" password)
+ export JENKINS_URL
+ export JENKINS_USER
+ export JENKINS_PASSWORD
+
echo "-----> Groovy script $script_file"
for cloud in "${clouds[@]}"; do
cfg_dir="${cloud}"
echo "Processing $cfg_dir"
- insert_file="$SCRIPT_DIR/$silo/$(basename $cloud)/cloud-cfg.txt"
- mkdir -p "$(dirname $insert_file)"
+ insert_file="$SCRIPT_DIR/$silo/$(basename "$cloud")/cloud-cfg.txt"
+ mkdir -p "$(dirname "$insert_file")"
rm -f "$insert_file"
echo "" >> "$insert_file"
echo "//////////////////////////////////////////////////" >> "$insert_file"
- echo "// Cloud config for $(basename $cloud)" >> "$insert_file"
+ echo "// Cloud config for $(basename "$cloud")" >> "$insert_file"
echo "//////////////////////////////////////////////////" >> "$insert_file"
echo "" >> "$insert_file"
- echo "templates = []" >> $insert_file
- mapfile -t templates < <(find $cfg_dir -maxdepth 1 -not -type d -not -name "cloud.cfg")
+ echo "templates = []" >> "$insert_file"
+ mapfile -t templates < <(find "$cfg_dir" -maxdepth 1 -not -type d -not -name "cloud.cfg")
for template in "${templates[@]}"; do
- get_template_cfg "$template" "$node_prefix" >> "$insert_file"
+ get_template_cfg "$template" "$silo" "$node_prefix" >> "$insert_file"
echo "templates.add(template)" >> "$insert_file"
done
Code Review / releng / global-jjb.git / blobdiff