summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2019-12-22 20:54:03 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-12-22 20:54:03 +0000
commit2f16f752b470be35e18a8a8ffb6861ec84658695 (patch)
tree6a7d784ee34a0e67aa86058c1302367aa114ddc1
parentfb0806e38744b393e9931421fe2eb6117d586bc3 (diff)
parent3e2f49891990dfd9ac4a0a86294f6bb1c1529170 (diff)
Merge "Dump all artifacts as last steps"
-rw-r--r--jjb/functest/functest-kubernetes.yaml48
1 files changed, 47 insertions, 1 deletions
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 38f721f3a..d3af3c811 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -112,12 +112,14 @@
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+ -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+ -e NODE_NAME=$slave \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \
-v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
-v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
- $image run_tests -t {test} -p
+ $image run_tests -t {test} -r -p
- builder:
name: functest-kubernetes-remove-images
@@ -223,6 +225,45 @@
- tag: hunter
test: xrally_kubernetes
+- builder:
+ name: functest-kubernetes-zip
+ builders:
+ - shell: |
+ set +x
+ [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+ if [ "{repo}" = "_" ]; then
+ image={container}:{tag}
+ elif [ "{port}" = "None" ]; then
+ image={repo}/{container}:{tag}
+ else
+ image={repo}:{port}/{container}:{tag}
+ fi
+ sudo docker run --rm \
+ -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+ -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes \
+ -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes \
+ -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+ -e BUILD_TAG=$BUILD_TAG \
+ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+ -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+ $image zip_campaign
+
+- job-template:
+ name: 'functest-kubernetes-{tag}-zip'
+ parameters:
+ - functest-kubernetes-build_tag:
+ build_tag: ''
+ builders:
+ - functest-kubernetes-zip:
+ <<: *functest-kubernetes-containers
+
+- project:
+ name: 'functest-kubernetes-{tag}-zip'
+ <<: *functest-kubernetes-params
+ container: 'kubernetes-healthcheck'
+ jobs:
+ - 'functest-kubernetes-{tag}-zip'
+
- job-template:
name: 'functest-kubernetes-{tag}-daily'
project-type: multijob
@@ -267,6 +308,11 @@
<<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
<<: *functest-kubernetes-jobs
+ - multijob:
+ name: dump all campaign data
+ projects:
+ - name: 'functest-kubernetes-{tag}-zip'
+ <<: *functest-kubernetes-jobs
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'