Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Multiply kubernetes configs
[releng.git]
/
jjb
/
functest
/
functest-kubernetes.yaml
diff --git
a/jjb/functest/functest-kubernetes.yaml
b/jjb/functest/functest-kubernetes.yaml
index
628b06e
..
24efc2c
100644
(file)
--- a/
jjb/functest/functest-kubernetes.yaml
+++ b/
jjb/functest/functest-kubernetes.yaml
@@
-57,7
+57,7
@@
else
image={repo}:{port}/{container}:{tag}
fi
else
image={repo}:{port}/{container}:{tag}
fi
-
sudo
docker pull $image
+ docker pull $image
- builder:
name: functest-kubernetes-build-containers
- builder:
name: functest-kubernetes-build-containers
@@
-77,7
+77,7
@@
build_arg="--build-arg {ref_arg}={ref}"
fi
cd {path}
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 .
--pull=false --no-cache --force-rm=true \
-t $image .
@@
-85,8
+85,10
@@
name: functest-kubernetes-run-containers
builders:
- shell: |
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
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
@@
-94,14
+96,14
@@
else
image={repo}:{port}/{container}:{tag}
fi
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 $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \
- -v /home/opnfv/functest-kubernetes/config:/root/.kube/config \
+ -v /home/opnfv/functest-kubernetes/config
.{tag}
:/root/.kube/config \
$image run_tests -t {test}
res=$?
gsutil -m cp -r $WORKSPACE/ \
$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"
find $WORKSPACE -type f \
-printf \
"http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID/%P\n"
@@
-119,7
+121,7
@@
else
image={repo}:{port}/{container}:{tag}
fi
else
image={repo}:{port}/{container}:{tag}
fi
-
sudo
docker rmi $image || true
+ docker rmi $image || true
- scm:
name: functest-kubernetes-scm
- scm:
name: functest-kubernetes-scm