X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=d3af3c811f0d5531eda691d928bfd4785ddba3de;hb=ea2f52db7d79dc3d9c256ee5891b4f34cb06eb32;hp=9f8f22d5e2d8c0b1bf10e8d1366ab62de040e4d6;hpb=562efe3dfe8c077a7872563c43523b9d913c9d61;p=releng.git diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 9f8f22d5e..d3af3c811 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -11,6 +11,9 @@ - latest: branch: master slave: lf-virtual8 + - jerma: + branch: stable/jerma + slave: lf-virtual8 - iruya: branch: stable/iruya slave: lf-virtual7 @@ -25,6 +28,12 @@ name: slave default: '{slave}' +- parameter: + name: functest-kubernetes-build_tag + parameters: + - random-string: + name: build_tag + - parameter: name: functest-kubernetes-branch parameters: @@ -90,8 +99,7 @@ name: functest-kubernetes-run-containers builders: - shell: | - set +e - set -x + set +ex [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -101,17 +109,17 @@ image={repo}:{port}/{container}:{tag} fi docker run --rm \ + -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 \ - $image run_tests -t {test} - res=$? - gsutil -m cp -r $WORKSPACE/ \ - 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" - exit $res + -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \ + $image run_tests -t {test} -r -p - builder: name: functest-kubernetes-remove-images @@ -159,13 +167,6 @@ jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-pull' -- project: - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-pull' - <<: *functest-kubernetes-params - container: 'functest-kubernetes-features' - jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-pull' - - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi' parameters: @@ -189,18 +190,13 @@ jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' -- project: - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-rmi' - <<: *functest-kubernetes-params - container: 'functest-kubernetes-features' - jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' - - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' builders: - functest-kubernetes-run-containers: <<: *functest-kubernetes-run-containers @@ -219,19 +215,54 @@ <<: *functest-kubernetes-params container: 'functest-kubernetes-smoke' test: + - xrally_kubernetes - k8s_conformance jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + exclude: + - tag: iruya + test: xrally_kubernetes + - 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-opnfv-functest-kubernetes-features' + name: 'functest-kubernetes-{tag}-zip' <<: *functest-kubernetes-params - container: 'functest-kubernetes-features' - test: - - stor4nfv_k8s - - clover_k8s + container: 'kubernetes-healthcheck' jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + - 'functest-kubernetes-{tag}-zip' - job-template: name: 'functest-kubernetes-{tag}-daily' @@ -241,6 +272,8 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' properties: - build-blocker: use-build-blocker: true @@ -255,8 +288,6 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi' - <<: *functest-kubernetes-jobs - multijob: name: pull containers projects: @@ -264,8 +295,6 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-pull' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-pull' - <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-healthcheck:{tag} projects: @@ -273,15 +302,16 @@ <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-smoke:{tag} + execution-type: SEQUENTIALLY projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run' + <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs - multijob: - name: opnfv/functest-kubernetes-features:{tag} + name: dump all campaign data projects: - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run' - <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run' + - name: 'functest-kubernetes-{tag}-zip' <<: *functest-kubernetes-jobs - job-template: @@ -313,21 +343,21 @@ ref: $branch - project: - name: 'functest-kubernetes-_-golang-alpine3.9-rmi' + name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi' repo: _ port: container: golang - tag: alpine3.9 + tag: '1.12-alpine3.10' slave: master jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' - project: - name: 'functest-kubernetes-_-golang-alpine3.9-pull' + name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull' repo: _ port: container: golang - tag: alpine3.9 + tag: '1.12-alpine3.10' slave: master jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-pull' @@ -362,22 +392,14 @@ - 'functest-kubernetes-{repo}-{container}-{tag}-gate' - 'functest-kubernetes-{repo}-{container}-{tag}-check' -- project: - name: functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-build - <<: *functest-kubernetes-params - container: functest-kubernetes-features - ref_arg: - path: docker/features - jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-gate' - - 'functest-kubernetes-{repo}-{container}-{tag}-check' - - job-template: name: 'functest-kubernetes-{tag}-check' project-type: multijob parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' - functest-kubernetes-branch: branch: '{branch}' properties: @@ -394,17 +416,15 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi' - <<: *functest-kubernetes-jobs - multijob: name: remove dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.9-rmi' + - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi' <<: *functest-kubernetes-jobs - multijob: name: pull dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.9-pull' + - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull' <<: *functest-kubernetes-jobs - multijob: name: build opnfv/functest-kubernetes-core @@ -421,8 +441,6 @@ projects: - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-check' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-check' - <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-healthcheck:{tag} projects: @@ -430,15 +448,11 @@ <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-smoke:{tag} + execution-type: SEQUENTIALLY projects: - - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' - <<: *functest-kubernetes-jobs - - multijob: - name: opnfv/functest-kubernetes-features:{tag} - projects: - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run' + - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run' + - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs - trigger: @@ -473,6 +487,8 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' properties: - build-blocker: use-build-blocker: true @@ -487,17 +503,15 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi' - <<: *functest-kubernetes-jobs - multijob: name: remove dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.9-rmi' + - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi' <<: *functest-kubernetes-jobs - multijob: name: pull dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.9-pull' + - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull' <<: *functest-kubernetes-jobs - multijob: name: build opnfv/functest-kubernetes-core @@ -514,8 +528,6 @@ projects: - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate' <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-gate' - <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-healthcheck:{tag} projects: @@ -523,15 +535,11 @@ <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-smoke:{tag} + execution-type: SEQUENTIALLY projects: - - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' + - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run' <<: *functest-kubernetes-jobs - - multijob: - name: opnfv/functest-kubernetes-features:{tag} - projects: - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run' - <<: *functest-kubernetes-jobs - - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run' + - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs - project: