diff options
| -rw-r--r-- | jjb/functest/functest-kubernetes-docker.yaml | 36 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 207 |
2 files changed, 221 insertions, 22 deletions
diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml index 21fbdb4ec..6d8846b5c 100644 --- a/jjb/functest/functest-kubernetes-docker.yaml +++ b/jjb/functest/functest-kubernetes-docker.yaml @@ -33,6 +33,22 @@ - 'core' - 'healthcheck' - 'smoke' + - 'cnf' + - 'security' + + exclude: + - stream: 'jerma' + image: 'cnf' + - stream: 'jerma' + image: 'security' + - stream: 'iruya' + image: 'cnf' + - stream: 'iruya' + image: 'security' + - stream: 'hunter' + image: 'cnf' + - stream: 'hunter' + image: 'security' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -109,21 +125,33 @@ - name: 'functest-kubernetes-core-docker-manifest-{stream}' <<: *manifest-job-settings - multijob: - name: 'build functest-kubernetes-healthcheck images' + name: 'build functest-kubernetes-[healthcheck,cnf,security] images' execution-type: PARALLEL projects: - name: 'functest-kubernetes-healthcheck-docker-build-amd64-{stream}' <<: *build-job-settings - name: 'functest-kubernetes-healthcheck-docker-build-arm64-{stream}' <<: *build-job-settings + - name: 'functest-kubernetes-cnf-docker-build-amd64-{stream}' + <<: *build-job-settings + - name: 'functest-kubernetes-cnf-docker-build-arm64-{stream}' + <<: *build-job-settings + - name: 'functest-kubernetes-security-docker-build-amd64-{stream}' + <<: *build-job-settings + - name: 'functest-kubernetes-security-docker-build-arm64-{stream}' + <<: *build-job-settings - multijob: - name: 'publish functest-kubernetes-healthcheck manifests' + name: 'publish functest-kubernetes-[healthcheck,cnf,security] manifests' execution-type: PARALLEL projects: - name: 'functest-kubernetes-healthcheck-docker-manifest-{stream}' <<: *manifest-job-settings + - name: 'functest-kubernetes-cnf-docker-manifest-{stream}' + <<: *manifest-job-settings + - name: 'functest-kubernetes-security-docker-manifest-{stream}' + <<: *manifest-job-settings - multijob: - name: 'build all functest-kubernetes images' + name: 'build functest-kubernetes-smoke image' condition: SUCCESSFUL execution-type: PARALLEL projects: @@ -132,7 +160,7 @@ - name: 'functest-kubernetes-smoke-docker-build-arm64-{stream}' <<: *build-job-settings - multijob: - name: 'publish all manifests' + name: 'publish functest-kubernetes-smoke manifests' condition: SUCCESSFUL execution-type: PARALLEL projects: diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index fcc1eb15e..553589858 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -42,17 +42,17 @@ default: '{branch}' - parameter: - name: functest-kubernetes-DEBUG - parameters: - - string: - name: DEBUG - default: 'true' -- parameter: name: functest-kubernetes-DEPLOY_SCENARIO parameters: - string: name: DEPLOY_SCENARIO default: k8-nosdn-nofeature-noha +- parameter: + name: functest-kubernetes-DEBUG + parameters: + - string: + name: DEBUG + default: 'true' - functest-kubernetes-containers: &functest-kubernetes-containers name: 'functest-kubernetes-containers' @@ -102,8 +102,8 @@ -e NODE_NAME=$slave \ -e BUILD_TAG=$BUILD_TAG \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ - -e DEBUG=$DEBUG \ -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \ + -e DEBUG=$DEBUG \ -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \ $image run_tests -t {test} -p -r @@ -182,6 +182,28 @@ jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-pull' +- project: + name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull' + <<: *functest-kubernetes-params + container: 'functest-kubernetes-cnf' + exclude: + - tag: jerma + - tag: iruya + - tag: hunter + jobs: + - 'functest-kubernetes-{repo}-{container}-{tag}-pull' + +- project: + name: 'functest-kubernetes-opnfv-functest-kubernetes-security-pull' + <<: *functest-kubernetes-params + container: 'functest-kubernetes-security' + exclude: + - tag: jerma + - tag: iruya + - tag: hunter + jobs: + - 'functest-kubernetes-{repo}-{container}-{tag}-pull' + - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi' parameters: @@ -205,6 +227,28 @@ jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' +- project: + name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-rmi' + <<: *functest-kubernetes-params + container: 'functest-kubernetes-cnf' + exclude: + - tag: jerma + - tag: iruya + - tag: hunter + jobs: + - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' + +- project: + name: 'functest-kubernetes-opnfv-functest-kubernetes-security-rmi' + <<: *functest-kubernetes-params + container: 'functest-kubernetes-security' + exclude: + - tag: jerma + - tag: iruya + - tag: hunter + jobs: + - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' + - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' parameters: @@ -212,10 +256,10 @@ slave: '{slave}' - functest-kubernetes-build_tag: build_tag: '' - - functest-kubernetes-DEBUG: - DEBUG: 'true' - functest-kubernetes-DEPLOY_SCENARIO: DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-DEBUG: + DEBUG: 'true' builders: - functest-kubernetes-run-containers: <<: *functest-kubernetes-run-containers @@ -244,6 +288,45 @@ jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' +- project: + name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf' + <<: *functest-kubernetes-params + container: 'functest-kubernetes-cnf' + test: + - k8s_vims + exclude: + - tag: jerma + test: k8s_vims + - tag: iruya + test: k8s_vims + - tag: hunter + test: k8s_vims + jobs: + - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + +- project: + name: 'functest-kubernetes-opnfv-functest-kubernetes-security' + <<: *functest-kubernetes-params + container: 'functest-kubernetes-security' + test: + - kube_hunter + - kube_bench + exclude: + - tag: jerma + test: kube_hunter + - tag: jerma + test: kube_bench + - tag: iruya + test: kube_hunter + - tag: iruya + test: kube_bench + - tag: hunter + test: kube_hunter + - tag: hunter + test: kube_bench + jobs: + - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + - builder: name: functest-kubernetes-zip @@ -266,8 +349,8 @@ -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \ -e BUILD_TAG=$BUILD_TAG \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ - -e DEBUG=$DEBUG \ -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \ + -e DEBUG=$DEBUG \ -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \ $image zip_campaign @@ -279,10 +362,10 @@ slave: '{slave}' - functest-kubernetes-build_tag: build_tag: '' - - functest-kubernetes-DEBUG: - DEBUG: 'true' - functest-kubernetes-DEPLOY_SCENARIO: DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-DEBUG: + DEBUG: 'true' builders: - functest-kubernetes-zip: <<: *functest-kubernetes-containers @@ -304,10 +387,10 @@ slave: '{slave}' - functest-kubernetes-build_tag: build_tag: '' - - functest-kubernetes-DEBUG: - DEBUG: 'true' - functest-kubernetes-DEPLOY_SCENARIO: DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-DEBUG: + DEBUG: 'true' properties: - build-blocker: use-build-blocker: true @@ -322,6 +405,10 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi' <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi' + <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi' + <<: *functest-kubernetes-jobs - multijob: name: pull containers projects: @@ -329,6 +416,10 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-pull' <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-pull' + <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-pull' + <<: *functest-kubernetes-jobs - multijob: name: opnfv/functest-kubernetes-healthcheck:{tag} projects: @@ -343,6 +434,18 @@ - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs - multijob: + name: opnfv/functest-kubernetes-cnf:{tag} + projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run' + <<: *functest-kubernetes-jobs + - multijob: + name: opnfv/functest-kubernetes-security:{tag} + projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run' + <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run' + <<: *functest-kubernetes-jobs + - multijob: name: dump all campaign data projects: - name: 'functest-kubernetes-{tag}-zip' @@ -417,6 +520,34 @@ - 'functest-kubernetes-{repo}-{container}-{tag}-check' - project: + name: functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-build + <<: *functest-kubernetes-params + container: functest-kubernetes-cnf + ref_arg: BRANCH + path: docker/cnf + exclude: + - tag: jerma + - tag: iruya + - tag: hunter + jobs: + - 'functest-kubernetes-{repo}-{container}-{tag}-gate' + - 'functest-kubernetes-{repo}-{container}-{tag}-check' + +- project: + name: functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-build + <<: *functest-kubernetes-params + container: functest-kubernetes-security + ref_arg: BRANCH + path: docker/security + exclude: + - tag: jerma + - tag: iruya + - tag: hunter + jobs: + - 'functest-kubernetes-{repo}-{container}-{tag}-gate' + - 'functest-kubernetes-{repo}-{container}-{tag}-check' + +- project: name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build <<: *functest-kubernetes-params container: functest-kubernetes-smoke @@ -436,10 +567,10 @@ build_tag: '' - functest-kubernetes-branch: branch: '{branch}' - - functest-kubernetes-DEBUG: - DEBUG: 'true' - functest-kubernetes-DEPLOY_SCENARIO: DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-DEBUG: + DEBUG: 'true' properties: - build-blocker: use-build-blocker: true @@ -454,6 +585,10 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi' <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi' + <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi' + <<: *functest-kubernetes-jobs - multijob: name: remove dependencies projects: @@ -474,6 +609,10 @@ projects: - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-check' <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-check' + <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-check' + <<: *functest-kubernetes-jobs - multijob: name: build containers projects: @@ -492,6 +631,18 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs + - multijob: + name: opnfv/functest-kubernetes-cnf:{tag} + projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run' + <<: *functest-kubernetes-jobs + - multijob: + name: opnfv/functest-kubernetes-security:{tag} + projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run' + <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run' + <<: *functest-kubernetes-jobs - trigger: name: functest-kubernetes-patchset-created @@ -527,10 +678,10 @@ slave: '{slave}' - functest-kubernetes-build_tag: build_tag: '' - - functest-kubernetes-DEBUG: - DEBUG: 'true' - functest-kubernetes-DEPLOY_SCENARIO: DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-DEBUG: + DEBUG: 'true' properties: - build-blocker: use-build-blocker: true @@ -545,6 +696,10 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi' <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi' + <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi' + <<: *functest-kubernetes-jobs - multijob: name: remove dependencies projects: @@ -565,6 +720,10 @@ projects: - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-gate' <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-gate' + <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-gate' + <<: *functest-kubernetes-jobs - multijob: name: build containers projects: @@ -583,6 +742,18 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs + - multijob: + name: opnfv/functest-kubernetes-cnf:{tag} + projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run' + <<: *functest-kubernetes-jobs + - multijob: + name: opnfv/functest-kubernetes-security:{tag} + projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run' + <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run' + <<: *functest-kubernetes-jobs - project: name: 'functest-kubernetes' |