diff options
Diffstat (limited to 'jjb/functest/xtesting-pi.yaml')
| -rw-r--r-- | jjb/functest/xtesting-pi.yaml | 56 |
1 files changed, 7 insertions, 49 deletions
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml index cf3d2ba05..eb51916e0 100644 --- a/jjb/functest/xtesting-pi.yaml +++ b/jjb/functest/xtesting-pi.yaml @@ -162,13 +162,6 @@ jobs: - 'xtesting-pi-{repo}-{container}-{tag}-pull' -- project: - name: 'xtesting-pi-ollivier-xtesting-mts-pull' - <<: *xtesting-pi-params - container: 'xtesting-mts' - jobs: - - 'xtesting-pi-{repo}-{container}-{tag}-pull' - - job-template: name: 'xtesting-pi-{repo}-{container}-{tag}-rmi' parameters: @@ -185,13 +178,6 @@ jobs: - 'xtesting-pi-{repo}-{container}-{tag}-rmi' -- project: - name: 'xtesting-pi-ollivier-xtesting-mts-rmi' - <<: *xtesting-pi-params - container: 'xtesting-mts' - jobs: - - 'xtesting-pi-{repo}-{container}-{tag}-rmi' - - job-template: name: 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run' parameters: @@ -218,40 +204,19 @@ - fifth - sixth - eighth + - nineth privileged: 'false' network: bridge uid: 1000 gid: 1000 + exclude: + - tag: wallaby + test: nineth + - tag: xena + test: nineth jobs: - 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run' -- job-template: - name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run' - parameters: - - xtesting-pi-node: - node: '{node}' - - xtesting-pi-build_tag: - build_tag: '' - builders: - - xtesting-pi-run-containers: - <<: *xtesting-pi-run-containers - -- project: - name: 'xtesting-pi-ollivier-xtesting-mts' - <<: *xtesting-pi-params - volumes: - env: - published_ports: - container: 'xtesting-mts' - test: - - seventh - privileged: 'false' - network: bridge - uid: 1000 - gid: 1000 - jobs: - - 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run' - - builder: name: xtesting-pi-zip builders: @@ -348,15 +313,11 @@ projects: - name: 'xtesting-pi-ollivier-xtesting-{tag}-rmi' <<: *xtesting-pi-jobs - - name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-rmi' - <<: *xtesting-pi-jobs - multijob: name: pull containers projects: - name: 'xtesting-pi-ollivier-xtesting-{tag}-pull' <<: *xtesting-pi-jobs - - name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-pull' - <<: *xtesting-pi-jobs - multijob: name: ollivier/xtesting:{tag} projects: @@ -374,10 +335,7 @@ <<: *xtesting-pi-jobs - name: 'xtesting-pi-ollivier-xtesting-{tag}-eighth-run' <<: *xtesting-pi-jobs - - multijob: - name: ollivier/xtesting-mts:{tag} - projects: - - name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-seventh-run' + - name: 'xtesting-pi-ollivier-xtesting-{tag}-nineth-run' <<: *xtesting-pi-jobs - multijob: name: dump all campaign data |