diff options
Diffstat (limited to 'jjb/functest/xtesting.yaml')
| -rw-r--r-- | jjb/functest/xtesting.yaml | 72 |
1 files changed, 53 insertions, 19 deletions
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 1239ad0be..389cfd0e7 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -59,12 +59,13 @@ - random-string: name: build_tag - - xtesting-run-containers: &xtesting-run-containers name: 'xtesting-run-containers' <<: *xtesting-containers test: '{test}' privileged: '{privileged}' + volumes: '{volumes}' + env: '{env}' network: '{network}' - builder: @@ -86,6 +87,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" ] && sudo rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -97,6 +100,8 @@ sudo 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/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \ -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \ @@ -169,7 +174,7 @@ - 'xtesting-{repo}-{container}-{tag}-rmi' - job-template: - name: 'xtesting-{repo}-{container}-{tag}-{test}-run' + name: 'xtesting-opnfv-xtesting-{tag}-{test}-run' parameters: - xtesting-slave: slave: '{slave}' @@ -182,6 +187,8 @@ - project: name: 'xtesting-opnfv-xtesting' <<: *xtesting-params + volumes: + env: container: 'xtesting' test: - first @@ -194,29 +201,46 @@ privileged: 'false' network: bridge exclude: - - {'tag': 'leguer', 'test': 'eighth'} - - {'tag': 'kali', 'test': 'eighth'} - - {'tag': 'jerma', 'test': 'eighth'} + - tag: leguer + test: eighth + - tag: kali + test: eighth + - tag: jerma + test: eighth jobs: - - 'xtesting-{repo}-{container}-{tag}-{test}-run' + - 'xtesting-opnfv-xtesting-{tag}-{test}-run' + +- job-template: + name: 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run' + parameters: + - xtesting-slave: + slave: '{slave}' + - xtesting-build_tag: + build_tag: '' + builders: + - xtesting-run-containers: + <<: *xtesting-run-containers - project: name: 'xtesting-opnfv-xtesting-mts' <<: *xtesting-params + volumes: + env: container: 'xtesting-mts' test: - seventh privileged: 'false' network: bridge jobs: - - 'xtesting-{repo}-{container}-{tag}-{test}-run' - + - 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run' - builder: name: xtesting-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" ] && sudo rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -226,6 +250,8 @@ image={repo}:{port}/{container}:{tag} fi sudo docker run --rm \ + $volumes \ + $env \ -e S3_ENDPOINT_URL=https://storage.googleapis.com \ -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting \ -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \ @@ -246,10 +272,14 @@ builders: - xtesting-zip: <<: *xtesting-containers + volumes: '{volumes}' + env: '{env}' - project: name: 'xtesting-{tag}-zip' <<: *xtesting-params + volumes: + env: container: 'xtesting' jobs: - 'xtesting-{tag}-zip' @@ -264,12 +294,14 @@ slave: '{slave}' - xtesting-build_tag: build_tag: '' + # PyYAML and yamllint differ here + # see https://github.com/yaml/pyyaml/issues/234 + # yamllint disable rule:indentation properties: - build-blocker: - use-build-blocker: true - blocking-level: 'NODE' blocking-jobs: - - '^xtesting-{tag}-(daily|docker|review)$' + - ^xtesting-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove former images @@ -508,7 +540,6 @@ jobs: - 'xtesting-{repo}-{container}-{tag}-gate' - - trigger: name: xtesting-patchset-created triggers: @@ -537,12 +568,14 @@ slave: '{slave}' - xtesting-build_tag: build_tag: '' + # PyYAML and yamllint differ here + # see https://github.com/yaml/pyyaml/issues/234 + # yamllint disable rule:indentation properties: - build-blocker: - use-build-blocker: true - blocking-level: 'NODE' blocking-jobs: - - '^xtesting-{tag}-(daily|docker|review)$' + - ^xtesting-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove former images @@ -679,7 +712,6 @@ jobs: - 'xtesting-{repo}-{container}-{tag}-build' - - job-template: name: 'xtesting-{tag}-docker' project-type: multijob @@ -691,12 +723,14 @@ parameters: - xtesting-slave: slave: '{slave}' + # PyYAML and yamllint differ here + # see https://github.com/yaml/pyyaml/issues/234 + # yamllint disable rule:indentation properties: - build-blocker: - use-build-blocker: true - blocking-level: 'NODE' blocking-jobs: - - '^xtesting-{tag}-(daily|docker|review)$' + - ^xtesting-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove dependency |