From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 27 Jul 2019 08:37:22 +0000 (+0000)
Subject: Merge "Update to python 3.7 and alpine 3.10"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0a2dfdffb822f822e041085a8e32fe4f87d55f87;hp=3aad5c124e77b44b513727281e471d7083eb190b;p=releng.git

Merge "Update to python 3.7 and alpine 3.10"
---

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 80fac1ccc..15bddb90b 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -100,7 +100,7 @@
             image={repo}:{port}/{container}:{tag}
           fi
           if [ "{tag}" = "latest" ]; then
-            py=3.6
+            py=3.7
           else
             py=2.7
           fi
@@ -496,21 +496,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.9-rmi'
+    name: 'functest-_-alpine-3.10-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.9
+    tag: 3.10
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.9-pull'
+    name: 'functest-_-alpine-3.10-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.9
+    tag: 3.10
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
@@ -618,12 +618,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-rmi'
+            - name: 'functest-_-alpine-3.10-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-pull'
+            - name: 'functest-_-alpine-3.10-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -798,12 +798,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-rmi'
+            - name: 'functest-_-alpine-3.10-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-pull'
+            - name: 'functest-_-alpine-3.10-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core