Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Python merge use git choosing strategy default
[releng/global-jjb.git]
/
shell
/
jenkins-configure-clouds.sh
diff --git
a/shell/jenkins-configure-clouds.sh
b/shell/jenkins-configure-clouds.sh
index
405eced
..
e5dba54
100644
(file)
--- a/
shell/jenkins-configure-clouds.sh
+++ b/
shell/jenkins-configure-clouds.sh
@@
-46,9
+46,6
@@
silos="${jenkins_silos:-jenkins}"
set -eu -o pipefail
set -eu -o pipefail
-os_plugin_version="$(lftools jenkins plugins list \
- | grep -i 'OpenStack Cloud Plugin')"
-
testversion() {
local current_val="$1" operator="$2" test_value="$3"
awk -vv1="$current_val" -vv2="$test_value" 'BEGIN {
testversion() {
local current_val="$1" operator="$2" test_value="$3"
awk -vv1="$current_val" -vv2="$test_value" 'BEGIN {
@@
-319,6
+316,11
@@
for silo in $silos; do
export JENKINS_USER
export JENKINS_PASSWORD
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 "-----> Groovy script $script_file"
for cloud in "${clouds[@]}"; do
cfg_dir="${cloud}"