X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=f235c4db370a1e7ea79fb9b98fab2972271cf8e1;hb=e9e775c4de6be47dd51b63f5a81e7aa365a9fea5;hp=45e063c5f67fee2af79b1772135b22781c66077d;hpb=e016a1177abbc0069d8eb172cb367f0d03d7f3bb;p=releng.git diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 45e063c5f..f235c4db3 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -10,15 +10,23 @@ tag: - latest: branch: master + slave: lf-virtual8 + - jerma: + branch: stable/jerma + slave: lf-virtual8 + - iruya: + branch: stable/iruya + slave: lf-virtual7 - hunter: branch: stable/hunter + slave: lf-virtual5 - parameter: name: functest-kubernetes-slave parameters: - label: name: slave - default: functest-virtual + default: '{slave}' - parameter: name: functest-kubernetes-branch @@ -57,7 +65,7 @@ else image={repo}:{port}/{container}:{tag} fi - sudo docker pull $image + docker pull $image - builder: name: functest-kubernetes-build-containers @@ -77,7 +85,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 . @@ -86,7 +94,7 @@ builders: - shell: | set +ex - [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true + [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} elif [ "{port}" = "None" ]; then @@ -94,10 +102,10 @@ 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 \ + -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ $image run_tests -t {test} res=$? gsutil -m cp -r $WORKSPACE/ \ @@ -119,7 +127,7 @@ else image={repo}:{port}/{container}:{tag} fi - sudo docker rmi $image || true + docker rmi $image || true - scm: name: functest-kubernetes-scm @@ -133,7 +141,8 @@ - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-pull' parameters: - - functest-kubernetes-slave + - functest-kubernetes-slave: + slave: '{slave}' builders: - functest-kubernetes-pull-containers: <<: *functest-kubernetes-containers @@ -152,17 +161,11 @@ 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: - - functest-kubernetes-slave + - functest-kubernetes-slave: + slave: '{slave}' builders: - functest-kubernetes-remove-images: <<: *functest-kubernetes-containers @@ -181,17 +184,11 @@ 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 + - functest-kubernetes-slave: + slave: '{slave}' builders: - functest-kubernetes-run-containers: <<: *functest-kubernetes-run-containers @@ -210,19 +207,15 @@ <<: *functest-kubernetes-params container: 'functest-kubernetes-smoke' test: + - xrally_kubernetes - k8s_conformance jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' - -- project: - name: 'functest-kubernetes-opnfv-functest-kubernetes-features' - <<: *functest-kubernetes-params - container: 'functest-kubernetes-features' - test: - - stor4nfv_k8s - - clover_k8s - jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + exclude: + - tag: iruya + test: xrally_kubernetes + - tag: hunter + test: xrally_kubernetes - job-template: name: 'functest-kubernetes-{tag}-daily' @@ -230,13 +223,14 @@ triggers: - timed: '@daily' parameters: - - functest-kubernetes-slave + - functest-kubernetes-slave: + slave: '{slave}' properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-[a-z]+-(daily|check|gate)$' + - '^functest-kubernetes-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -245,8 +239,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: @@ -254,8 +246,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: @@ -263,21 +253,18 @@ <<: *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 - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-gate' parameters: - - functest-kubernetes-slave + - functest-kubernetes-slave: + slave: '{slave}' scm: - functest-kubernetes-scm: ref: $GERRIT_REFSPEC @@ -289,7 +276,8 @@ - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-check' parameters: - - functest-kubernetes-slave + - functest-kubernetes-slave: + slave: '{slave}' - functest-kubernetes-branch: branch: '{branch}' scm: @@ -301,20 +289,22 @@ 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' @@ -348,21 +338,12 @@ - '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 + - functest-kubernetes-slave: + slave: '{slave}' - functest-kubernetes-branch: branch: '{branch}' properties: @@ -370,7 +351,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-[a-z]+-(daily|check|gate)$' + - '^functest-kubernetes-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -379,17 +360,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 @@ -406,8 +385,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: @@ -415,15 +392,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: @@ -456,13 +429,14 @@ - functest-kubernetes-patchset-created: branch: '{branch}' parameters: - - functest-kubernetes-slave + - functest-kubernetes-slave: + slave: '{slave}' properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-[a-z]+-(daily|check|gate)$' + - '^functest-kubernetes-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -471,17 +445,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 @@ -498,8 +470,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: @@ -507,15 +477,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: