Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
validation: iec: Pull docker images before run
[ci-management.git]
/
jjb
/
shell
/
run_bluval.sh
diff --git
a/jjb/shell/run_bluval.sh
b/jjb/shell/run_bluval.sh
index
fbe9aed
..
d850f79
100755
(executable)
--- a/
jjb/shell/run_bluval.sh
+++ b/
jjb/shell/run_bluval.sh
@@
-15,6
+15,7
@@
export PATH=$PATH:/home/jenkins/.local/bin
cwd=$(pwd)
current_user=$(whoami)
is_optional="false"
cwd=$(pwd)
current_user=$(whoami)
is_optional="false"
+pull="false"
info () {
logger -s -t "run_blu_val.info" "$*"
info () {
logger -s -t "run_blu_val.info" "$*"
@@
-66,7
+67,7
@@
error () {
}
# Get options from shell
}
# Get options from shell
-while getopts "j:k:u:s:b:l:r:n:ov:" optchar; do
+while getopts "j:k:u:s:b:l:r:n:o
p
v:" optchar; do
case "${optchar}" in
j) cluster_master_ip=${OPTARG} ;;
k) k8s_config_dir=${OPTARG} ;;
case "${optchar}" in
j) cluster_master_ip=${OPTARG} ;;
k) k8s_config_dir=${OPTARG} ;;
@@
-76,6
+77,7
@@
while getopts "j:k:u:s:b:l:r:n:ov:" optchar; do
n) blueprint_name=${OPTARG} ;;
u) sh_user=${OPTARG} ;;
o) is_optional="true" ;;
n) blueprint_name=${OPTARG} ;;
u) sh_user=${OPTARG} ;;
o) is_optional="true" ;;
+ p) pull="true" ;;
v) version=${OPTARG} ;;
*) echo "Non-option argument: '-${OPTARG}'" >&2
usage
v) version=${OPTARG} ;;
*) echo "Non-option argument: '-${OPTARG}'" >&2
usage
@@
-162,6
+164,10
@@
if [ "$is_optional" == "true" ] || [ "$OPTIONAL" == "yes" ]
then
options+=" -o"
fi
then
options+=" -o"
fi
+if [ "$pull" == "true" ] || [ "$PULL" == "yes" ]
+then
+ options+=" -p"
+fi
set +e
if python3 --version > /dev/null; then
set +e
if python3 --version > /dev/null; then