From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 19 Nov 2018 10:50:22 +0000 (+0100)
Subject: Pull all containers before running tests
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=475486404eaf7d89dbdafd9ce244efd824371777

Pull all containers before running tests

Else we might test previous containers.

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

diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml
index e9b44be1a..fb908baaf 100644
--- a/jjb/functest/functest-virtual.yaml
+++ b/jjb/functest/functest-virtual.yaml
@@ -7,6 +7,36 @@
       - hunter
       - latest
 
+- job-template:
+    name: '{repo}-functest-{container}-{tag}-pull'
+    parameters:
+      - functest-virtual-defaults
+    builders:
+      - shell: docker pull {repo}/functest-{container}:{tag}
+
+- project:
+    name: repo-functest-container-tag-pull
+    <<: *functest-defaultparameters
+    container:
+      - healthcheck
+      - smoke
+      - benchmarking
+      - components
+      - vnf
+      - features
+    jobs:
+      - '{repo}-functest-{container}-{tag}-pull'
+
+- functest-pulljobs: &functest-pulljobs
+    name: 'functest-pulljobs'
+    projects:
+      - name: '{repo}-functest-healthcheck-{tag}-pull'
+      - name: '{repo}-functest-smoke-{tag}-pull'
+      - name: '{repo}-functest-benchmarking-{tag}-pull'
+      - name: '{repo}-functest-components-{tag}-pull'
+      - name: '{repo}-functest-vnf-{tag}-pull'
+      - name: '{repo}-functest-features-{tag}-pull'
+
 - functest-buildparameters: &functest-buildparameters
     name: 'functest-buildparameters'
     parameters:
@@ -21,7 +51,7 @@
       - functest-virtual-defaults
     builders:
       - shell: |
-          sudo docker run --rm true \
+          sudo docker run --rm \
             -e EXTERNAL_NETWORK=public1 \
             -v /home/opnfv/functest/results/$JOB_NAME-$BUILD_ID:\
           /home/opnfv/functest/results \
@@ -193,6 +223,9 @@
     parameters:
       - functest-virtual-defaults
     builders:
+      - multijob:
+          name: pull containers
+          <<: *functest-pulljobs
       - multijob:
           name: healthcheck
           <<: *functest-healthcheckjobs