X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=2652967563df77bed7a0e01b4f53751c2f5c57b5;hb=dbf849cd0df14206d05743272d8520fa7284ccd9;hp=1c2ed83be45ba143d23157373d82b77801466b1d;hpb=06b371b23ca5f2ffec3babfe5b88a49325862950;p=releng.git diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 1c2ed83be..265296756 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -8,6 +8,8 @@ repo: 'opnfv' port: tag: + - iruya: + branch: stable/iruya - hunter: branch: stable/hunter @@ -55,7 +57,7 @@ else image={repo}:{port}/{container}:{tag} fi - sudo docker pull $image + docker pull $image - builder: name: functest-kubernetes-build-containers @@ -75,7 +77,7 @@ build_arg="--build-arg {ref_arg}={ref}" fi cd {path} - sudo docker build $build_arg \ + docker build $build_arg \ --pull=false --no-cache --force-rm=true \ -t $image . @@ -83,8 +85,10 @@ name: functest-kubernetes-run-containers builders: - shell: | - set +ex - [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true + set +e + set -x + echo $WORKSPACE + [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} elif [ "{port}" = "None" ]; then @@ -92,14 +96,14 @@ else image={repo}:{port}/{container}:{tag} fi - sudo docker run --rm \ + docker run --rm \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \ -v /home/opnfv/functest-kubernetes/config:/root/.kube/config \ $image run_tests -t {test} res=$? gsutil -m cp -r $WORKSPACE/ \ - gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID > /dev/null 2>&1 + gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID find $WORKSPACE -type f \ -printf \ "http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID/%P\n" @@ -117,7 +121,7 @@ else image={repo}:{port}/{container}:{tag} fi - sudo docker rmi $image || true + docker rmi $image || true - scm: name: functest-kubernetes-scm