summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/xtesting.yaml84
1 files changed, 83 insertions, 1 deletions
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index f2b3dacf6..433a6ee12 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -62,6 +62,8 @@
name: 'xtesting-run-containers'
<<: *xtesting-containers
test: '{test}'
+ privileged: '{privileged}'
+ network: '{network}'
- builder:
name: xtesting-pull-containers
@@ -91,6 +93,8 @@
image={repo}:{port}/{container}:{tag}
fi
sudo docker run --rm \
+ --privileged={privileged} \
+ --network={network} \
-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 \
@@ -170,6 +174,13 @@
jobs:
- 'xtesting-{repo}-{container}-{tag}-pull'
+- project:
+ name: 'xtesting-opnfv-xtesting-mts-pull'
+ <<: *xtesting-params
+ container: 'xtesting-mts'
+ jobs:
+ - 'xtesting-{repo}-{container}-{tag}-pull'
+
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-rmi'
parameters:
@@ -186,6 +197,13 @@
jobs:
- 'xtesting-{repo}-{container}-{tag}-rmi'
+- project:
+ name: 'xtesting-opnfv-xtesting-mts-rmi'
+ <<: *xtesting-params
+ container: 'xtesting-mts'
+ jobs:
+ - 'xtesting-{repo}-{container}-{tag}-rmi'
+
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-{test}-run'
parameters:
@@ -215,9 +233,30 @@
test: sixth
- tag: iruya
test: sixth
+ privileged: 'false'
+ network: bridge
jobs:
- 'xtesting-{repo}-{container}-{tag}-{test}-run'
+- project:
+ name: 'xtesting-opnfv-xtesting-mts'
+ <<: *xtesting-params
+ container: 'xtesting-mts'
+ test:
+ - seventh
+ exclude:
+ - tag: hunter
+ test: seventh
+ - tag: iruya
+ test: seventh
+ - tag: jerma
+ test: seventh
+ - tag: kali
+ test: seventh
+ privileged: 'false'
+ network: bridge
+ jobs:
+ - 'xtesting-{repo}-{container}-{tag}-{test}-run'
- builder:
name: xtesting-zip
@@ -288,11 +327,15 @@
projects:
- name: 'xtesting-opnfv-xtesting-{tag}-rmi'
<<: *xtesting-jobs
+ - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
+ <<: *xtesting-jobs
- multijob:
name: pull containers
projects:
- name: 'xtesting-opnfv-xtesting-{tag}-pull'
<<: *xtesting-jobs
+ - name: 'xtesting-opnfv-xtesting-mts-{tag}-pull'
+ <<: *xtesting-jobs
- multijob:
name: opnfv/xtesting:{tag}
projects:
@@ -309,6 +352,11 @@
- name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
<<: *xtesting-jobs
- multijob:
+ name: opnfv/xtesting-mts:{tag}
+ projects:
+ - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+ <<: *xtesting-jobs
+ - multijob:
name: dump all campaign data
projects:
- name: 'xtesting-{tag}-zip'
@@ -367,7 +415,17 @@
<<: *xtesting-params
container: xtesting
ref_arg: BRANCH
- path: docker
+ path: docker/core
+ jobs:
+ - 'xtesting-{repo}-{container}-{tag}-gate'
+ - 'xtesting-{repo}-{container}-{tag}-check'
+
+- project:
+ name: xtesting-opnfv-xtesting-mts-{tag}-build
+ <<: *xtesting-params
+ container: xtesting-mts
+ ref_arg: BRANCH
+ path: docker/mts
jobs:
- 'xtesting-{repo}-{container}-{tag}-gate'
- 'xtesting-{repo}-{container}-{tag}-check'
@@ -396,6 +454,8 @@
projects:
- name: 'xtesting-opnfv-xtesting-{tag}-rmi'
<<: *xtesting-jobs
+ - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
+ <<: *xtesting-jobs
- multijob:
name: remove dependencies
projects:
@@ -412,6 +472,11 @@
- name: 'xtesting-opnfv-xtesting-{tag}-check'
<<: *xtesting-jobs
- multijob:
+ name: opnfv/xtesting-mts
+ projects:
+ - name: 'xtesting-opnfv-xtesting-mts-{tag}-check'
+ <<: *xtesting-jobs
+ - multijob:
name: opnfv/xtesting:{tag}
projects:
- name: 'xtesting-opnfv-xtesting-{tag}-first-run'
@@ -426,6 +491,11 @@
<<: *xtesting-jobs
- name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
<<: *xtesting-jobs
+ - multijob:
+ name: opnfv/xtesting-mts:{tag}
+ projects:
+ - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+ <<: *xtesting-jobs
- trigger:
name: xtesting-patchset-created
@@ -475,6 +545,8 @@
projects:
- name: 'xtesting-opnfv-xtesting-{tag}-rmi'
<<: *xtesting-jobs
+ - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
+ <<: *xtesting-jobs
- multijob:
name: remove dependencies
projects:
@@ -491,6 +563,11 @@
- name: 'xtesting-opnfv-xtesting-{tag}-gate'
<<: *xtesting-jobs
- multijob:
+ name: opnfv/xtesting-mts
+ projects:
+ - name: 'xtesting-opnfv-xtesting-mts-{tag}-gate'
+ <<: *xtesting-jobs
+ - multijob:
name: opnfv/xtesting:{tag}
projects:
- name: 'xtesting-opnfv-xtesting-{tag}-first-run'
@@ -505,6 +582,11 @@
<<: *xtesting-jobs
- name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
<<: *xtesting-jobs
+ - multijob:
+ name: opnfv/xtesting-mts:{tag}
+ projects:
+ - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+ <<: *xtesting-jobs
- project:
name: 'xtesting'