From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sun, 10 Nov 2019 07:54:30 +0000 (+0100)
Subject: Build new functest-smoke-cntt containers
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=368adda8beebcf81166a1a51d9190f837c6ee554;p=releng.git

Build new functest-smoke-cntt containers

[1] has been backported to Jerma, Iruya and Hunter.

[1] https://gerrit.opnfv.org/gerrit/c/functest/+/68668

Change-Id: I4c7f58a1a07791bf37c0b35d55b61a41fe5c6566
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 001509441..8685ea4b3 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -43,12 +43,6 @@
         image: 'tempest'
       - stream: 'jerma'
         image: 'tempest'
-      - stream: 'jerma'
-        image: 'smoke-cntt'
-      - stream: 'iruya'
-        image: 'smoke-cntt'
-      - stream: 'hunter'
-        image: 'smoke-cntt'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -159,10 +153,6 @@
               <<: *build-job-settings
             - name: 'functest-vnf-docker-build-arm64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-smoke-cntt-docker-build-amd64-{stream}'
-              <<: *build-job-settings
-            - name: 'functest-smoke-cntt-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish all manifests'
           condition: SUCCESSFUL
@@ -176,6 +166,20 @@
               <<: *manifest-job-settings
             - name: 'functest-vnf-docker-manifest-{stream}'
               <<: *manifest-job-settings
+      - multijob:
+          name: 'build all functest cntt images'
+          condition: SUCCESSFUL
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-smoke-cntt-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-smoke-cntt-docker-build-arm64-{stream}'
+              <<: *build-job-settings
+      - multijob:
+          name: 'publish all cntt manifests'
+          condition: SUCCESSFUL
+          execution-type: PARALLEL
+          projects:
             - name: 'functest-smoke-cntt-docker-manifest-{stream}'
               <<: *manifest-job-settings