X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=d628117d12452de35814230655837116e7675e8f;hb=38212fb43515a4681e2a0e90eea8abd44947892b;hp=51638ff39b773b5ba0ade67bf29fd903dbcdc7fb;hpb=1a632d79c86df67898619509dd822466f6122f47;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 51638ff39..d628117d1 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -218,8 +218,8 @@
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-smoke'
     test:
-      - k8s_conformance
       - xrally_kubernetes
+      - k8s_conformance
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
     exclude:
@@ -321,21 +321,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
+    name: 'functest-kubernetes-_-golang-alpine3.10-rmi'
     repo: _
     port:
     container: golang
-    tag: alpine3.9
+    tag: 'alpine3.10'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.9-pull'
+    name: 'functest-kubernetes-_-golang-alpine3.10-pull'
     repo: _
     port:
     container: golang
-    tag: alpine3.9
+    tag: 'alpine3.10'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
@@ -407,12 +407,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
+            - name: 'functest-kubernetes-_-golang-alpine3.10-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
+            - name: 'functest-kubernetes-_-golang-alpine3.10-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -503,12 +503,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
+            - name: 'functest-kubernetes-_-golang-alpine3.10-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
+            - name: 'functest-kubernetes-_-golang-alpine3.10-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core