X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjenkins-configure-clouds.sh;h=ed1a30c09c51cd995f1c04564555d5ac98dd3703;hb=9268e4ab2c79a5605c59865ac5dd96231de75518;hp=47023f7d4132395afc471fd16764f5c555947ddb;hpb=0ccbbe044a37d03bb4d0a0bc18e6da592231e9b9;p=releng%2Fglobal-jjb.git diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh index 47023f7d..ed1a30c0 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. @@ -28,7 +28,7 @@ # # 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 @@ -36,19 +36,28 @@ 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 -eu -o pipefail -version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } +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 + } + }' +} get_cfg() { if [ -z ${3+x} ]; then @@ -71,8 +80,9 @@ get_cfg() { } 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 @@ -102,8 +112,9 @@ get_cloud_cfg() { echo ")" } + get_launcher_factory() { - if [ -z $1 ]; then + if [ -z "$1" ]; then >&2 echo "Usage: get_launcher_factory JNLP|SSH" exit 1 fi @@ -120,8 +131,9 @@ get_launcher_factory() { fi } + get_minion_options() { - if [ -z $1 ]; then + if [ -z "$1" ]; then >&2 echo "Usage: get_minion_options CFG_FILE" exit 1 fi @@ -132,6 +144,25 @@ get_minion_options() { # 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" + 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["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" @@ -142,105 +173,109 @@ get_minion_options() { 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" 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["v3-standard-2"]="d6906d2a-e83f-42be-b33e-fbaeb5c511cb" + flavors["v3-standard-4"]="5f1eb09f-e764-4642-a16f-a7230ec025e7" + flavors["v3-standard-8"]="47d3707a-c6c6-46ea-a15b-095e336b1edc" + flavors["v3-standard-16"]="8587d458-69de-4fc5-be51-c5e671bc35d5" + flavors["v3-standard-32"]="3e01b39f-45a9-4b7b-b6dc-14378433dc36" + 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 "") hardware_id=$(get_cfg "$cfg_file" HARDWARE_ID "") network_id=$(get_cfg "$cfg_file" NETWORK_ID "") - - udi_default="$(get_cfg "$(dirname $cfg_file)/cloud.cfg" 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") if [ "$silo" == "sandbox" ]; then instance_cap=$(get_cfg "$cfg_file" SANDBOX_CAP "null") + else + instance_cap=$(get_cfg "$cfg_file" INSTANCE_CAP "null") fi - min_instance_cap=$(get_cfg "$cfg_file" MIN_INSTANCE_CAP "null") floating_ip_pool=$(get_cfg "$cfg_file" FLOATING_IP_POOL "") 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") - - kpn_default="$(get_cfg "$(dirname $cfg_file)/cloud.cfg" 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") + node_properties=$(get_cfg "$cfg_file" NODE_PROPERTIES, "null") + retention_time=$(get_cfg "$cfg_file" RETENTION_TIME "0") + config_drive=$(get_cfg "$cfg_file" CONFIG_DRIVE, "null") - OS_PLUGIN_VER="$(lftools jenkins plugins list \ - | grep -i 'OpenStack Cloud Plugin' | awk -F':' '{print $2}')" - if version_ge "$OS_PLUGIN_VER" "2.35"; then - if [ ! -z "$volume_size" ]; then - echo " new BootSource.VolumeFromImage(\"$image_name\", $volume_size)," - else - echo " new BootSource.Image(\"$image_name\")," - fi - echo " \"${flavors[${hardware_id}]}\"," - echo " \"$network_id\"," - echo " \"$user_data_id\"," - echo " $instance_cap," - echo " $min_instance_cap," - echo " \"$floating_ip_pool\"," - echo " \"$security_groups\"," - echo " \"$availability_zone\"," - echo " $start_timeout," - echo " \"$key_pair_name\"," - echo " $num_executors," - echo " \"$jvm_options\"," - echo " \"$fs_root\"," - echo " $launcher_factory," - echo " $retention_time" - else # SlaveOptions() structure for versions <= 2.34 - if [ ! -z "$volume_size" ]; then - echo " new BootSource.VolumeFromImage(\"$image_name\", $volume_size)," - else - echo " new BootSource.Image(\"$image_name\")," - fi - echo " \"${flavors[${hardware_id}]}\"," - echo " \"$network_id\"," - echo " \"$user_data_id\"," - echo " $instance_cap," - echo " \"$floating_ip_pool\"," - echo " \"$security_groups\"," - echo " \"$availability_zone\"," - echo " $start_timeout," - echo " \"$key_pair_name\"," - echo " $num_executors," - echo " \"$jvm_options\"," - echo " \"$fs_root\"," - echo " $launcher_factory," + if [ -n "$volume_size" ]; then + echo " new BootSource.VolumeFromImage(\"$image_name\", $volume_size)," + else + echo " new BootSource.Image(\"$image_name\")," + fi + + echo " \"${flavors[${hardware_id}]}\"," + echo " \"$network_id\"," + echo " \"$user_data_id\"," + echo " $instance_cap," + + # 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," + else + instance_min=$(get_cfg "$cfg_file" INSTANCE_MIN_CAPMAX "null") + echo " $instance_min," + fi + + echo " \"$floating_ip_pool\"," + echo " \"$security_groups\"," + echo " \"$availability_zone\"," + echo " $start_timeout," + echo " \"$key_pair_name\"," + echo " $num_executors," + echo " \"$jvm_options\"," + echo " \"$fs_root\"," + echo " $launcher_factory," + + if testversion "$os_plugin_version" '>=' '2.47' + then + echo " $node_properties," + echo " $retention_time", + echo " $config_drive" + else echo " $retention_time" fi + + } get_template_cfg() { - if [ -z $2 ]; then + if [ -z "$2" ]; then >&2 echo "Usage: get_template_cfg CFG_FILE SILO [MINION_PREFIX]" exit 1 fi @@ -250,7 +285,7 @@ get_template_cfg() { 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(" @@ -265,7 +300,12 @@ get_template_cfg() { echo ")" } -mapfile -t clouds < <(ls -d1 $OS_CLOUD_DIR/*/) +# shellcheck disable=SC1090 +. ~/lf-env.sh + +lf-activate-venv --python python3 lftools + +mapfile -t clouds < <(ls -d1 "$OS_CLOUD_DIR"/*/) for silo in $silos; do @@ -291,22 +331,30 @@ for silo in $silos; do export JENKINS_USER export JENKINS_PASSWORD + # 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')" + 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 "//////////////////////////////////////////////////" >> "$insert_file" - echo "" >> "$insert_file" + { + echo "" + echo "//////////////////////////////////////////////////" + echo "// Cloud config for $(basename "$cloud")" + echo "//////////////////////////////////////////////////" + 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" "$silo" "$node_prefix" >> "$insert_file" echo "templates.add(template)" >> "$insert_file"