summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-09-14 17:11:23 +0200
committerMorgan Richomme <morgan.richomme@orange.com>2017-09-14 17:11:23 +0200
commit5848c2ff1fda42851b42832d2bb6b8cb87adfd1f (patch)
treecd7be292ebc287a4b19e6a870107458e72cc0ec5 /jjb
parent6b30c00a481d452d1b9ee4468054ce59e631f19a (diff)
Apply docker config adaptations to alpines
regression reported by barometer project 1) --privileged=true no more set in docker run 2) wrong INSTALLER_IP -e INSTALLER_IP=192.168.122.169 3) ssh_key no more mounted -v /root/.ssh/id_rsa:/root/.ssh/id_rsa Change-Id: Iccda9d57b7ea4c346ff26e9b2f74320bfe7eec95 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/functest/functest-alpine.sh2
-rw-r--r--jjb/functest/functest-daily-jobs.yml6
2 files changed, 5 insertions, 3 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 33a64a414..d15b98554 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -80,7 +80,7 @@ for tier in ${tiers[@]}; do
FUNCTEST_IMAGE=opnfv/functest-${tier}
echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
docker pull ${FUNCTEST_IMAGE}>/dev/null
- cmd="docker run ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
+ cmd="docker run --privileged=true ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
echo "Running Functest tier '${tier}'. CMD: ${cmd}"
eval ${cmd}
done
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index cbf175567..23c6e490a 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -378,7 +378,6 @@
name: functest-daily-builder
builders:
- 'functest-cleanup'
- - 'set-functest-env-alpine'
- 'functest-daily'
- 'functest-store-results'
@@ -412,7 +411,10 @@
name: functest-daily
builders:
- shell:
- !include-raw: ./functest-alpine.sh
+ !include-raw:
+ - ./functest-env-presetup.sh
+ - ../../utils/fetch_os_creds.sh
+ - ./functest-alpine.sh
- builder:
name: functest-arm-daily