From 537d2d637d8d626e15fa5486f916ff57e2e5501e Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Mon, 17 Apr 2023 16:37:08 +0200 Subject: [PATCH] Remove Xtesting MTS in gates MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I0da74cb2f7fad9bb900bd2864b6f60e08081c681 Signed-off-by: Cédric Ollivier --- jjb/functest/xtesting-pi.yaml | 56 +++------------------- jjb/functest/xtesting.yaml | 105 ++++-------------------------------------- 2 files changed, 15 insertions(+), 146 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 diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 745b98714..7e4df1289 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -162,13 +162,6 @@ 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: @@ -185,13 +178,6 @@ 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-opnfv-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-opnfv-xtesting-{tag}-{test}-run' -- job-template: - name: 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run' - parameters: - - xtesting-node: - node: '{node}' - - xtesting-build_tag: - build_tag: '' - builders: - - xtesting-run-containers: - <<: *xtesting-run-containers - -- project: - name: 'xtesting-opnfv-xtesting-mts' - <<: *xtesting-params - volumes: - env: - published_ports: - container: 'xtesting-mts' - test: - - seventh - privileged: 'false' - network: bridge - uid: 1000 - gid: 1000 - jobs: - - 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run' - - builder: name: xtesting-zip builders: @@ -348,15 +313,11 @@ 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: @@ -374,10 +335,7 @@ <<: *xtesting-jobs - name: 'xtesting-opnfv-xtesting-{tag}-eighth-run' <<: *xtesting-jobs - - multijob: - name: opnfv/xtesting-mts:{tag} - projects: - - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run' + - name: 'xtesting-opnfv-xtesting-{tag}-nineth-run' <<: *xtesting-jobs - multijob: name: dump all campaign data @@ -585,15 +543,6 @@ jobs: - 'xtesting-{repo}-{container}-{tag}-gate' -- project: - name: xtesting-opnfv-xtesting-mts-{tag}-gate - <<: *xtesting-params - container: xtesting-mts - ref_arg: BRANCH - path: docker/mts - jobs: - - 'xtesting-{repo}-{container}-{tag}-gate' - - trigger: name: xtesting-patchset-created triggers: @@ -636,8 +585,6 @@ projects: - name: 'xtesting-opnfv-xtesting-{tag}-rmi' <<: *xtesting-jobs - - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi' - <<: *xtesting-jobs - multijob: name: remove dependency projects: @@ -653,11 +600,6 @@ projects: - 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: @@ -675,10 +617,7 @@ <<: *xtesting-jobs - name: 'xtesting-opnfv-xtesting-{tag}-eighth-run' <<: *xtesting-jobs - - multijob: - name: opnfv/xtesting-mts:{tag} - projects: - - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run' + - name: 'xtesting-opnfv-xtesting-{tag}-nineth-run' <<: *xtesting-jobs publishers: - email-ext: @@ -763,15 +702,6 @@ jobs: - 'xtesting-{repo}-{container}-{tag}-build' -- project: - name: xtesting-opnfv-xtesting-mts-{tag}-build - <<: *xtesting-params - container: xtesting-mts - ref_arg: BRANCH - path: docker/mts - jobs: - - 'xtesting-{repo}-{container}-{tag}-build' - - job-template: name: 'xtesting-{tag}-docker' project-type: multijob @@ -807,11 +737,6 @@ projects: - name: 'xtesting-opnfv-xtesting-{tag}-build' <<: *xtesting-jobs - - multijob: - name: opnfv/xtesting-mts - projects: - - name: 'xtesting-opnfv-xtesting-mts-{tag}-build' - <<: *xtesting-jobs publishers: - email-ext: failure: false @@ -861,13 +786,6 @@ jobs: - 'xtesting-{repo}-{container}-{tag}-trivy' -- project: - name: 'xtesting-opnfv-xtesting-mts-trivy' - <<: *xtesting-params - container: 'xtesting-mts' - jobs: - - 'xtesting-{repo}-{container}-{tag}-trivy' - - builder: name: xtesting-grype builders: @@ -910,13 +828,6 @@ jobs: - 'xtesting-{repo}-{container}-{tag}-grype' -- project: - name: 'xtesting-opnfv-xtesting-mts-grype' - <<: *xtesting-params - container: 'xtesting-mts' - jobs: - - 'xtesting-{repo}-{container}-{tag}-grype' - - project: name: 'xtesting' <<: *xtesting-params -- 2.16.6