From 255ed0857d2d32727e26c95fdad966b34fe105eb Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 16 Nov 2023 14:45:33 +0100 Subject: Align Xtesting based jobs with latest XtestingCI changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icdfbad95c109999e5c334ba831d52cd77dbf4bf9 Signed-off-by: Cédric Ollivier --- jjb/functest/functest-kubernetes-pi.yaml | 2 +- jjb/functest/functest-kubernetes.yaml | 42 ++++++++++++++--------------- jjb/functest/functest-pi.yaml | 2 +- jjb/functest/functest.yaml | 46 ++++++++++++++++---------------- jjb/functest/xtesting-pi.yaml | 2 +- jjb/functest/xtesting.yaml | 22 +++++++-------- 6 files changed, 58 insertions(+), 58 deletions(-) (limited to 'jjb/functest') diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml index 73d3e0cc6..a4200cd25 100644 --- a/jjb/functest/functest-kubernetes-pi.yaml +++ b/jjb/functest/functest-kubernetes-pi.yaml @@ -767,7 +767,7 @@ <<: *functest-kubernetes-pi-run-containers - project: - name: 'functest-kubernetes-pi-{tag}-zip' + name: 'functest-kubernetes-pi-zip' <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params volumes: - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 8d4e2a79d..a31ed12f2 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -767,7 +767,7 @@ <<: *functest-kubernetes-run-containers - project: - name: 'functest-kubernetes-{tag}-zip' + name: 'functest-kubernetes-zip' <<: *functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params volumes: - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config @@ -1007,7 +1007,7 @@ dependency: 3.14 - project: - name: 'functest-kubernetes-{tag}-dep-pull' + name: 'functest-kubernetes-dep-pull' <<: *functest-kubernetes-dep-params jobs: - 'functest-kubernetes-{tag}-dep-pull' @@ -1022,7 +1022,7 @@ <<: *functest-kubernetes-dep - project: - name: 'functest-kubernetes-{tag}-dep-rmi' + name: 'functest-kubernetes-dep-rmi' <<: *functest-kubernetes-dep-params jobs: - 'functest-kubernetes-{tag}-dep-rmi' @@ -1085,7 +1085,7 @@ build_args: '{build_args}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate + name: functest-kubernetes-opnfv-functest-kubernetes-core-gate <<: *functest-kubernetes-params repo: opnfv port: @@ -1110,7 +1110,7 @@ build_args: '{build_args}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-gate + name: functest-kubernetes-opnfv-functest-kubernetes-healthcheck-gate <<: *functest-kubernetes-params repo: opnfv port: @@ -1135,7 +1135,7 @@ build_args: '{build_args}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-gate + name: functest-kubernetes-opnfv-functest-kubernetes-cnf-gate <<: *functest-kubernetes-params repo: opnfv port: @@ -1160,7 +1160,7 @@ build_args: '{build_args}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-gate + name: functest-kubernetes-opnfv-functest-kubernetes-security-gate <<: *functest-kubernetes-params repo: opnfv port: @@ -1185,7 +1185,7 @@ build_args: '{build_args}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate + name: functest-kubernetes-opnfv-functest-kubernetes-smoke-gate <<: *functest-kubernetes-params repo: opnfv port: @@ -1210,7 +1210,7 @@ build_args: '{build_args}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-gate + name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-gate <<: *functest-kubernetes-params repo: opnfv port: @@ -1447,7 +1447,7 @@ ref: '{branch}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-build + name: functest-kubernetes-opnfv-functest-kubernetes-core-build <<: *functest-kubernetes-params repo: opnfv container: functest-kubernetes-core @@ -1475,7 +1475,7 @@ ref: '{branch}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-build + name: functest-kubernetes-opnfv-functest-kubernetes-healthcheck-build <<: *functest-kubernetes-params repo: opnfv container: functest-kubernetes-healthcheck @@ -1503,7 +1503,7 @@ ref: '{branch}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-build + name: functest-kubernetes-opnfv-functest-kubernetes-cnf-build <<: *functest-kubernetes-params repo: opnfv container: functest-kubernetes-cnf @@ -1531,7 +1531,7 @@ ref: '{branch}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-build + name: functest-kubernetes-opnfv-functest-kubernetes-security-build <<: *functest-kubernetes-params repo: opnfv container: functest-kubernetes-security @@ -1559,7 +1559,7 @@ ref: '{branch}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build + name: functest-kubernetes-opnfv-functest-kubernetes-smoke-build <<: *functest-kubernetes-params repo: opnfv container: functest-kubernetes-smoke @@ -1587,7 +1587,7 @@ ref: '{branch}' - project: - name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build + name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-build <<: *functest-kubernetes-params repo: opnfv container: functest-kubernetes-benchmarking @@ -1658,6 +1658,12 @@ fixed: true recipients: cedric.ollivier@orange.com +- project: + name: 'functest-kubernetes-docker' + <<: *functest-kubernetes-params + jobs: + - 'functest-kubernetes-{tag}-docker' + - builder: name: functest-kubernetes-trivy builders: @@ -2181,12 +2187,6 @@ jobs: - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-sbom' -- project: - name: 'functest-kubernetes' - <<: *functest-kubernetes-params - jobs: - - 'functest-kubernetes-{tag}-docker' - - view: name: functest-kubernetes-docker view-type: list diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml index f9a5ab5ed..1ac14f584 100644 --- a/jjb/functest/functest-pi.yaml +++ b/jjb/functest/functest-pi.yaml @@ -1017,7 +1017,7 @@ <<: *functest-pi-run-containers - project: - name: 'functest-pi-{tag}-zip' + name: 'functest-pi-zip' <<: *functest-pi-ollivier-functest-healthcheck-params volumes: - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 1884e2209..0a2e86c3a 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -947,7 +947,7 @@ <<: *functest-run-containers - project: - name: 'functest-{tag}-zip' + name: 'functest-zip' <<: *functest-opnfv-functest-healthcheck-params volumes: - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file @@ -1247,7 +1247,7 @@ dependency: 3.13 - project: - name: 'functest-{tag}-dep-pull' + name: 'functest-dep-pull' <<: *functest-dep-params jobs: - 'functest-{tag}-dep-pull' @@ -1262,7 +1262,7 @@ <<: *functest-dep - project: - name: 'functest-{tag}-dep-rmi' + name: 'functest-dep-rmi' <<: *functest-dep-params jobs: - 'functest-{tag}-dep-rmi' @@ -1325,7 +1325,7 @@ build_args: '{build_args}' - project: - name: functest-opnfv-functest-core-{tag}-gate + name: functest-opnfv-functest-core-gate <<: *functest-params repo: opnfv port: @@ -1350,7 +1350,7 @@ build_args: '{build_args}' - project: - name: functest-opnfv-functest-healthcheck-{tag}-gate + name: functest-opnfv-functest-healthcheck-gate <<: *functest-params repo: opnfv port: @@ -1375,7 +1375,7 @@ build_args: '{build_args}' - project: - name: functest-opnfv-functest-smoke-{tag}-gate + name: functest-opnfv-functest-smoke-gate <<: *functest-params repo: opnfv port: @@ -1400,7 +1400,7 @@ build_args: '{build_args}' - project: - name: functest-opnfv-functest-benchmarking-{tag}-gate + name: functest-opnfv-functest-benchmarking-gate <<: *functest-params repo: opnfv port: @@ -1425,7 +1425,7 @@ build_args: '{build_args}' - project: - name: functest-opnfv-functest-vnf-{tag}-gate + name: functest-opnfv-functest-vnf-gate <<: *functest-params repo: opnfv port: @@ -1450,7 +1450,7 @@ build_args: '{build_args}' - project: - name: functest-opnfv-functest-smoke-cntt-{tag}-gate + name: functest-opnfv-functest-smoke-cntt-gate <<: *functest-params repo: opnfv port: @@ -1475,7 +1475,7 @@ build_args: '{build_args}' - project: - name: functest-opnfv-functest-benchmarking-cntt-{tag}-gate + name: functest-opnfv-functest-benchmarking-cntt-gate <<: *functest-params repo: opnfv port: @@ -1769,7 +1769,7 @@ ref: '{branch}' - project: - name: functest-opnfv-functest-core-{tag}-build + name: functest-opnfv-functest-core-build <<: *functest-params repo: opnfv container: functest-core @@ -1797,7 +1797,7 @@ ref: '{branch}' - project: - name: functest-opnfv-functest-healthcheck-{tag}-build + name: functest-opnfv-functest-healthcheck-build <<: *functest-params repo: opnfv container: functest-healthcheck @@ -1825,7 +1825,7 @@ ref: '{branch}' - project: - name: functest-opnfv-functest-smoke-{tag}-build + name: functest-opnfv-functest-smoke-build <<: *functest-params repo: opnfv container: functest-smoke @@ -1853,7 +1853,7 @@ ref: '{branch}' - project: - name: functest-opnfv-functest-benchmarking-{tag}-build + name: functest-opnfv-functest-benchmarking-build <<: *functest-params repo: opnfv container: functest-benchmarking @@ -1881,7 +1881,7 @@ ref: '{branch}' - project: - name: functest-opnfv-functest-vnf-{tag}-build + name: functest-opnfv-functest-vnf-build <<: *functest-params repo: opnfv container: functest-vnf @@ -1909,7 +1909,7 @@ ref: '{branch}' - project: - name: functest-opnfv-functest-smoke-cntt-{tag}-build + name: functest-opnfv-functest-smoke-cntt-build <<: *functest-params repo: opnfv container: functest-smoke-cntt @@ -1937,7 +1937,7 @@ ref: '{branch}' - project: - name: functest-opnfv-functest-benchmarking-cntt-{tag}-build + name: functest-opnfv-functest-benchmarking-cntt-build <<: *functest-params repo: opnfv container: functest-benchmarking-cntt @@ -2007,6 +2007,12 @@ fixed: true recipients: cedric.ollivier@orange.com +- project: + name: 'functest-docker' + <<: *functest-params + jobs: + - 'functest-{tag}-docker' + - builder: name: functest-trivy builders: @@ -2608,12 +2614,6 @@ jobs: - 'functest-opnfv-functest-benchmarking-cntt-{tag}-sbom' -- project: - name: 'functest' - <<: *functest-params - jobs: - - 'functest-{tag}-docker' - - view: name: functest-docker view-type: list diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml index ecb3cdca4..6deb80984 100644 --- a/jjb/functest/xtesting-pi.yaml +++ b/jjb/functest/xtesting-pi.yaml @@ -321,7 +321,7 @@ <<: *xtesting-pi-run-containers - project: - name: 'xtesting-pi-{tag}-zip' + name: 'xtesting-pi-zip' <<: *xtesting-pi-ollivier-xtesting-params volumes: env: diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 7e9c6977e..1e1215dc7 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -321,7 +321,7 @@ <<: *xtesting-run-containers - project: - name: 'xtesting-{tag}-zip' + name: 'xtesting-zip' <<: *xtesting-opnfv-xtesting-params volumes: env: @@ -493,7 +493,7 @@ dependency: 3.13 - project: - name: 'xtesting-{tag}-dep-pull' + name: 'xtesting-dep-pull' <<: *xtesting-dep-params jobs: - 'xtesting-{tag}-dep-pull' @@ -508,7 +508,7 @@ <<: *xtesting-dep - project: - name: 'xtesting-{tag}-dep-rmi' + name: 'xtesting-dep-rmi' <<: *xtesting-dep-params jobs: - 'xtesting-{tag}-dep-rmi' @@ -571,7 +571,7 @@ build_args: '{build_args}' - project: - name: xtesting-opnfv-xtesting-{tag}-gate + name: xtesting-opnfv-xtesting-gate <<: *xtesting-params repo: opnfv port: @@ -732,7 +732,7 @@ ref: '{branch}' - project: - name: xtesting-opnfv-xtesting-{tag}-build + name: xtesting-opnfv-xtesting-build <<: *xtesting-params repo: opnfv container: xtesting @@ -784,6 +784,12 @@ fixed: true recipients: cedric.ollivier@orange.com +- project: + name: 'xtesting-docker' + <<: *xtesting-params + jobs: + - 'xtesting-{tag}-docker' + - builder: name: xtesting-trivy builders: @@ -917,12 +923,6 @@ jobs: - 'xtesting-opnfv-xtesting-{tag}-sbom' -- project: - name: 'xtesting' - <<: *xtesting-params - jobs: - - 'xtesting-{tag}-docker' - - view: name: xtesting-docker view-type: list -- cgit 1.2.3-korg