Merge "Update cloud image list docs"

diff --git a/check_prefix.sh b/check_prefix.sh
index 87a8427a04b67db9db8c569ca5c63cc36a7e6f40..397bf4d49b658c833be2391e9825d2284e737309 100755 (executable)
--- a/check_prefix.sh
+++ b/check_prefix.sh
@@ -12,7 +12,7 @@
 #
 # The production prefix MUST always be a blank string.
 
-if grep 'prefix:' jjb/releng-defaults.yaml | grep -v "''"; then
+if grep 'prefix:' jjb/defaults.yaml | grep -v "''"; then
     echo "ERROR: A non-blank prefix is defined in jjb/releng-defaults.yaml"
     echo "The prefix MUST be set to blank '' in production!"
     exit 1

diff --git a/jjb/autorelease/notify-build-failure.sh b/jjb/autorelease/notify-build-failure.sh
index 939c46b5ef06883c1f7fbf1663510f31e91af62d..7eefa4043a0322fca793e253466cd4796ea4fe88 100644 (file)
--- a/jjb/autorelease/notify-build-failure.sh
+++ b/jjb/autorelease/notify-build-failure.sh
@@ -38,9 +38,11 @@ REACTOR_INFO=$(awk '/Reactor Summary:/ { flag=1 }
 # check for project format
 if [[ ${REACTOR_INFO} =~ .*::*.*::*. ]]; then
     # extract project and artifactId from full format
-    ODL=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $1); print $1 }')
-    PROJECT_=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $2); print $2 }')
-    NAME=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $3); print $3 }')
+    # Ex: REACTOR_INFO="ODL::sfc::odl-sfc-pot-netconf-renderer 072 " is broken down into
+    # NAME="ODL", PROJECT_="sfc" and NAME="odl-sfc-pot-netconf-renderer"
+    ODL=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+[0-9]+[ \t]+$|[ \t]+$/, "", $1); print $1}')
+    PROJECT_=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+[0-9]+[ \t]+$|[ \t]+$/, "", $2); print $2}')
+    NAME=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+[0-9]+[ \t]+$|[ \t]+$/, "", $3); print $3}')
 else
     # set project from partial format
     ODL=""

diff --git a/jjb/releng-defaults.yaml b/jjb/defaults.yaml
similarity index 100%
rename from jjb/releng-defaults.yaml
rename to jjb/defaults.yaml

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 1472f1d1b8778446bedd627c9dd24abf08297746..82641eef30c49d2b9f14c8046a45df1cb4718b83 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -36,6 +36,7 @@
 
     project-name: lf-infra-common-packer
     project: releng/common-packer
+    project-pattern: releng/common-packer
     build-node: centos7-builder-2c-8g
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-common-packer/38930/
     rtd-token: 0cdf727cc22f8f888ffec0e69f46d89031018776