diff options
Diffstat (limited to 'test-ick')
| -rwxr-xr-x | test-ick | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -30,19 +30,26 @@ set -eu run_ansible="$1" +ci_dist="$2" +prefix="$3" ansible="$HOME/code/ick/ick2-ansible" rules="$HOME/code/ick/liw-ci" -controller="https://ickdev-controller.vm.liw.fi" +controller="https://ickdev2-controller.vm.liw.fi" + +tool() +{ + "$HOME/code/ick/ick2/icktool" -c "$controller" --no-verify-tls "$@" +} build_status() { - icktool -c "$controller" status | awk -v "p=$1" '$1 == p { print $5 }' + tool status | awk -v "p=$1" '$1 == p { print $5 }' } current_log() { - icktool -c "$controller" status | awk -v "p=$1" '$1 == p { print $7 }' + tool status | awk -v "p=$1" '$1 == p { print $7 }' } wait_for_build_to_start() @@ -91,7 +98,7 @@ build() local log="$(current_log "$project")" echo "Triggering $project" - icktool -c "$controller" trigger "$project" + tool trigger "$project" wait_for_build_to_start "$project" "$log" wait_for_build_to_finish "$project" } @@ -100,10 +107,10 @@ build() if [ "$run_ansible" = yes ] then cd "$ansible" - ./run-cluster.sh hosts.ickdev -e @ci-vars.yml + ./run-cluster.sh hosts.ickdev -e "ick_prefix=$prefix" -e "ci_dist=$ci_dist" -e @ci-vars.yml fi -icktool -c "$controller" make-it-so < "${rules}/ickdev.yaml" +tool make-it-so < "${rules}/ickdev.yaml" build ick_stretch build ick2 |