Merge "Support PostBuildScript 2.x"

diff --git a/docs/best-practices.rst b/docs/best-practices.rst
index a9d4d20..fa78db5 100644 (file)
--- a/docs/best-practices.rst
+++ b/docs/best-practices.rst
@@ -337,12 +337,18 @@ variable. JJB will fill in whatever is in the defaults configuration.
 
 Variable expansion order of precedence seems to be:
 
-1. project section definition
-2. job-template variable definition
-3. defaults.yaml variable definition
+1. job-group section definition
+2. project section definition
+3. job-template variable definition
+4. defaults.yaml variable definition
 
 .. note:: Defaults set variables in job-templates and are NOT used in Macros.
 
+global-jjb should not provide job-group definitions and leave it up to users of
+global-jjb to create their own as a job-group as a variable defined in a job
+group the highest precendence. Global JJB should strive to be purely a
+job-template and macro library for downstream consumers.
+
 Final thoughts
 --------------
 

diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst
index 1a31b75..8b1324a 100644 (file)
--- a/docs/jjb/lf-ci-jobs.rst
+++ b/docs/jjb/lf-ci-jobs.rst
@@ -179,6 +179,7 @@ OpenStack Cloud plugin version supported:
 
 * 2.30
 * 2.31
+* 2.32
 
 Cloud configuration are managed via a directory structure in ci-management as
 follows:

diff --git a/shell/gerrit-fetch-dependencies.sh b/shell/gerrit-fetch-dependencies.sh
index 55c0cf1..d7f830b 100644 (file)
--- a/shell/gerrit-fetch-dependencies.sh
+++ b/shell/gerrit-fetch-dependencies.sh
@@ -30,7 +30,7 @@ set +u  # Allow unbound variables for virtualenv
 virtualenv --quiet "/tmp/v/git-review"
 # shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091
 source "/tmp/v/git-review/bin/activate"
-pip install --quiet --upgrade pip
+pip install --quiet --upgrade pip setuptools
 pip install --quiet --upgrade git-review
 set -u
 # End git-review workaround

diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh
index ab7f909..a04c16c 100644 (file)
--- a/shell/jenkins-configure-clouds.sh
+++ b/shell/jenkins-configure-clouds.sh
@@ -123,6 +123,7 @@ get_minion_options() {
     flavors["v2-highcpu-32"]="21dfb8a3-c472-4a2c-a8e1-4da8de415ff8"
 
     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")
@@ -143,7 +144,11 @@ get_minion_options() {
     fs_root=$(get_cfg "$cfg_file" FS_ROOT "/w")
     retention_time=$(get_cfg "$cfg_file" RETENTION_TIME "0")
 
-    echo "    new BootSource.Image(\"$image_name\"),"
+    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\","

diff --git a/shell/jjb-install.sh b/shell/jjb-install.sh
index 48af507..728261c 100644 (file)
--- a/shell/jjb-install.sh
+++ b/shell/jjb-install.sh
@@ -17,7 +17,7 @@ set -e -o pipefail
 virtualenv "/tmp/v/jjb"
 # shellcheck source=/tmp/v/jjb/bin/activate disable=SC1091
 source "/tmp/v/jjb/bin/activate"
-pip install --quiet --upgrade pip
+pip install --quiet --upgrade pip setuptools
 pip install --quiet --upgrade pipdeptree
 pip install --quiet --upgrade "jenkins-job-builder==$JJB_VERSION"
 

diff --git a/shell/lftools-install.sh b/shell/lftools-install.sh
index bdf380f..c13086a 100644 (file)
--- a/shell/lftools-install.sh
+++ b/shell/lftools-install.sh
@@ -50,7 +50,7 @@ set -e -o pipefail
 virtualenv --quiet "/tmp/v/lftools"
 # shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
 source "/tmp/v/lftools/bin/activate"
-pip install --quiet --upgrade pip
+pip install --quiet --upgrade pip setuptools
 
 case $LFTOOLS_MODE in
     gerrit)

diff --git a/shell/node-install.sh b/shell/node-install.sh
index cec2f33..43aa7b4 100644 (file)
--- a/shell/node-install.sh
+++ b/shell/node-install.sh
@@ -17,7 +17,7 @@ set -e -o pipefail
 virtualenv --quiet "/tmp/v/python"
 # shellcheck source=/tmp/v/node/bin/activate disable=SC1091
 source "/tmp/v/python/bin/activate"
-pip install --quiet --upgrade pip
+pip install --quiet --upgrade pip setuptools
 pip install --quiet --upgrade pipdeptree
 pip install --quiet --upgrade nodeenv
 

diff --git a/shell/pip-install.sh b/shell/pip-install.sh
index b2aacfe..c75005d 100644 (file)
--- a/shell/pip-install.sh
+++ b/shell/pip-install.sh
@@ -24,7 +24,7 @@ set -e -o pipefail
 virtualenv "/tmp/v/${PIP_PACKAGES%% *}"
 # shellcheck source=/tmp/v/venv/bin/activate disable=SC1091
 source "/tmp/v/${PIP_PACKAGES%% *}/bin/activate"
-pip install --quiet --upgrade pip
+pip install --quiet --upgrade pip setuptools
 pip install --quiet --upgrade pipdeptree
 
 # PIP_PACKAGES needs to be passed through as a space separated list of packages

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 652043b..254defe 100644 (file)
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -17,7 +17,7 @@ set -e -o pipefail
 virtualenv --quiet -p "$PYTHON_VERSION" "/tmp/v/tox"
 # shellcheck source=/tmp/v/tox/bin/activate disable=SC1091
 source "/tmp/v/tox/bin/activate"
-pip install --quiet --upgrade pip
+pip install --quiet --upgrade pip setuptools
 pip install --quiet --upgrade pipdeptree
 pip install --quiet --upgrade argparse detox tox tox-pyenv