diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-06-29 11:17:31 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-06-29 11:17:31 +0200 |
commit | 08358993fcab1ba47dcd2d24a4f99915e6725fcc (patch) | |
tree | 10795163eb01508a79da081ad867506b7cd9e052 /jjb/functest/functest-kubernetes.yaml | |
parent | 6c338b47697e221e6264d7adac20ae75c7485561 (diff) |
Update all Functest jjbs
It leverages latest changes from XtestingCI
Change-Id: Ic1e5e6bd95ff18a91855d4cdff38a1f4611f123e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/functest-kubernetes.yaml')
-rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 120 |
1 files changed, 108 insertions, 12 deletions
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index b84514969..a42784ab3 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -72,6 +72,8 @@ <<: *functest-kubernetes-containers test: '{test}' privileged: '{privileged}' + volumes: '{volumes}' + env: '{env}' network: '{network}' - builder: @@ -93,6 +95,8 @@ builders: - shell: | set +x + volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done + env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -104,6 +108,8 @@ docker run --rm \ --privileged={privileged} \ --network={network} \ + $volumes \ + $env \ -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 \ @@ -113,9 +119,6 @@ -e NODE_NAME=$slave \ -e BUILD_TAG=$BUILD_TAG \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ - -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \ - -e E2E_TEST_OPTS=$E2E_TEST_OPTS \ - -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ $image run_tests -t {test} -p -r - builder: @@ -221,7 +224,7 @@ - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' - job-template: - name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run' parameters: - functest-kubernetes-slave: slave: '{slave}' @@ -238,6 +241,11 @@ - project: name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck' <<: *functest-kubernetes-params + volumes: + - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config + env: + - DEPLOY_SCENARIO=$DEPLOY_SCENARIO + - E2E_TEST_OPTS=$E2E_TEST_OPTS container: 'functest-kubernetes-healthcheck' test: - k8s_quick @@ -245,11 +253,31 @@ privileged: 'false' network: bridge jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run' + +- job-template: + name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-{test}-run' + parameters: + - functest-kubernetes-slave: + slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' + - functest-kubernetes-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-E2E_TEST_OPTS: + E2E_TEST_OPTS: container-runtime:containerd + builders: + - functest-kubernetes-run-containers: + <<: *functest-kubernetes-run-containers - project: name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke' <<: *functest-kubernetes-params + volumes: + - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config + env: + - DEPLOY_SCENARIO=$DEPLOY_SCENARIO + - E2E_TEST_OPTS=$E2E_TEST_OPTS container: 'functest-kubernetes-smoke' test: - xrally_kubernetes @@ -279,11 +307,31 @@ - tag: v1.21 test: k8s_io jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-{test}-run' + +- job-template: + name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-{test}-run' + parameters: + - functest-kubernetes-slave: + slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' + - functest-kubernetes-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-E2E_TEST_OPTS: + E2E_TEST_OPTS: container-runtime:containerd + builders: + - functest-kubernetes-run-containers: + <<: *functest-kubernetes-run-containers - project: name: 'functest-kubernetes-opnfv-functest-kubernetes-security' <<: *functest-kubernetes-params + volumes: + - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config + env: + - DEPLOY_SCENARIO=$DEPLOY_SCENARIO + - E2E_TEST_OPTS=$E2E_TEST_OPTS container: 'functest-kubernetes-security' test: - kube_hunter @@ -292,11 +340,31 @@ privileged: 'false' network: bridge jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-{test}-run' + +- job-template: + name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run' + parameters: + - functest-kubernetes-slave: + slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' + - functest-kubernetes-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-E2E_TEST_OPTS: + E2E_TEST_OPTS: container-runtime:containerd + builders: + - functest-kubernetes-run-containers: + <<: *functest-kubernetes-run-containers - project: name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking' <<: *functest-kubernetes-params + volumes: + - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config + env: + - DEPLOY_SCENARIO=$DEPLOY_SCENARIO + - E2E_TEST_OPTS=$E2E_TEST_OPTS container: 'functest-kubernetes-benchmarking' test: - xrally_kubernetes_full @@ -304,11 +372,31 @@ privileged: 'false' network: bridge jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run' + +- job-template: + name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run' + parameters: + - functest-kubernetes-slave: + slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' + - functest-kubernetes-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + - functest-kubernetes-E2E_TEST_OPTS: + E2E_TEST_OPTS: container-runtime:containerd + builders: + - functest-kubernetes-run-containers: + <<: *functest-kubernetes-run-containers - project: name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf' <<: *functest-kubernetes-params + volumes: + - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config + env: + - DEPLOY_SCENARIO=$DEPLOY_SCENARIO + - E2E_TEST_OPTS=$E2E_TEST_OPTS container: 'functest-kubernetes-cnf' test: - k8s_vims @@ -317,13 +405,15 @@ privileged: 'false' network: bridge jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run' - builder: name: functest-kubernetes-zip builders: - shell: | set +x + volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done + env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -333,6 +423,8 @@ image={repo}:{port}/{container}:{tag} fi docker run --rm \ + $volumes \ + $env \ -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 \ @@ -341,9 +433,6 @@ -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 DEPLOY_SCENARIO=$DEPLOY_SCENARIO \ - -e E2E_TEST_OPTS=$E2E_TEST_OPTS \ - -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ $image zip_campaign - job-template: @@ -360,10 +449,17 @@ builders: - functest-kubernetes-zip: <<: *functest-kubernetes-containers + volumes: '{volumes}' + env: '{env}' - project: name: 'functest-kubernetes-{tag}-zip' <<: *functest-kubernetes-params + volumes: + - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config + env: + - DEPLOY_SCENARIO=$DEPLOY_SCENARIO + - E2E_TEST_OPTS=$E2E_TEST_OPTS container: 'functest-kubernetes-healthcheck' jobs: - 'functest-kubernetes-{tag}-zip' |