From 24c013f8b61480ece7100580f1ab4fb3f0978369 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Sun, 10 Nov 2019 09:04:38 +0100
Subject: [PATCH] Buld cntt containers in a specific stage
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

They must be built after smoke.

Change-Id: I939ef6c4663ad940c9f1b95440980628c4880385
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit de56278767076c2edb00865d65b4d7495acb6d9e)
---
 .travis.yml | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 83febe783..fa516e2a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -148,24 +148,6 @@ jobs:
         - amd64_dirs=""
         - arm64_dirs=""
         - arm_dirs="docker/vnf"
-    - script: sudo -E bash build.sh
-      env:
-        - REPO="${DOCKER_USERNAME}"
-        - amd64_dirs="docker/smoke-cntt"
-        - arm64_dirs=""
-        - arm_dirs=""
-    - script: sudo -E bash build.sh
-      env:
-        - REPO="${DOCKER_USERNAME}"
-        - amd64_dirs=""
-        - arm64_dirs="docker/smoke-cntt"
-        - arm_dirs=""
-    - script: sudo -E bash build.sh
-      env:
-        - REPO="${DOCKER_USERNAME}"
-        - amd64_dirs=""
-        - arm64_dirs=""
-        - arm_dirs="docker/smoke-cntt"
     - stage: publish all manifests
       script: >
         sudo manifest-tool push from-args \
@@ -187,7 +169,27 @@ jobs:
           --platforms linux/amd64,linux/arm,linux/arm64 \
           --template ${DOCKER_USERNAME}/functest-vnf:ARCH-iruya \
           --target ${DOCKER_USERNAME}/functest-vnf:iruya
-    - script: >
+    - stage: build all functest cntt images
+      script: sudo -E bash build.sh
+      env:
+        - REPO="${DOCKER_USERNAME}"
+        - amd64_dirs="docker/smoke-cntt"
+        - arm64_dirs=""
+        - arm_dirs=""
+    - script: sudo -E bash build.sh
+      env:
+        - REPO="${DOCKER_USERNAME}"
+        - amd64_dirs=""
+        - arm64_dirs="docker/smoke-cntt"
+        - arm_dirs=""
+    - script: sudo -E bash build.sh
+      env:
+        - REPO="${DOCKER_USERNAME}"
+        - amd64_dirs=""
+        - arm64_dirs=""
+        - arm_dirs="docker/smoke-cntt"
+    - stage: publish all cntt manifests
+      script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64,linux/arm,linux/arm64 \
           --template ${DOCKER_USERNAME}/functest-smoke-cntt:ARCH-iruya \
-- 
2.16.6