Merge "Update jjb for Alpine 3.13"

4 files changed, 32 insertions, 32 deletions

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 01022dfff..d3b839018 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -507,21 +507,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.15-alpine3.12-rmi'
+    name: 'functest-kubernetes-_-golang-1.15-alpine3.13-rmi'
     repo: _
     port:
     container: golang
-    tag: '1.15-alpine3.12'
+    tag: '1.15-alpine3.13'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.15-alpine3.12-pull'
+    name: 'functest-kubernetes-_-golang-1.15-alpine3.13-pull'
     repo: _
     port:
     container: golang
-    tag: '1.15-alpine3.12'
+    tag: '1.15-alpine3.13'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
@@ -623,12 +623,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-rmi'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.13-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-pull'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.13-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -753,12 +753,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-rmi'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.13-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-pull'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.13-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index 3bd858527..2f6d4a0d7 100644
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -704,21 +704,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-ovn-_-alpine-3.12-rmi'
+    name: 'functest-ovn-_-alpine-3.13-rmi'
     repo: _
     port:
     container: alpine
-    tag: '3.12'
+    tag: '3.13'
     slave: master
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-ovn-_-alpine-3.12-pull'
+    name: 'functest-ovn-_-alpine-3.13-pull'
     repo: _
     port:
     container: alpine
-    tag: '3.12'
+    tag: '3.13'
     slave: master
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-pull'
@@ -846,12 +846,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.12-rmi'
+            - name: 'functest-ovn-_-alpine-3.13-rmi'
               <<: *functest-ovn-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.12-pull'
+            - name: 'functest-ovn-_-alpine-3.13-pull'
               <<: *functest-ovn-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -1072,12 +1072,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.12-rmi'
+            - name: 'functest-ovn-_-alpine-3.13-rmi'
               <<: *functest-ovn-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.12-pull'
+            - name: 'functest-ovn-_-alpine-3.13-pull'
               <<: *functest-ovn-jobs
       - multijob:
           name: build opnfv/functest-core
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 59a5a12e1..925d6dea5 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -774,21 +774,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.12-rmi'
+    name: 'functest-_-alpine-3.13-rmi'
     repo: _
     port:
     container: alpine
-    tag: '3.12'
+    tag: '3.13'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.12-pull'
+    name: 'functest-_-alpine-3.13-pull'
     repo: _
     port:
     container: alpine
-    tag: '3.12'
+    tag: '3.13'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
@@ -921,12 +921,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.12-rmi'
+            - name: 'functest-_-alpine-3.13-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.12-pull'
+            - name: 'functest-_-alpine-3.13-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -1150,12 +1150,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.12-rmi'
+            - name: 'functest-_-alpine-3.13-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.12-pull'
+            - name: 'functest-_-alpine-3.13-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 640e3492b..7a41b6818 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -409,21 +409,21 @@
           ref: $branch
 
 - project:
-    name: 'xtesting-_-alpine-3.12-rmi'
+    name: 'xtesting-_-alpine-3.13-rmi'
     repo: _
     port:
     container: alpine
-    tag: '3.12'
+    tag: '3.13'
     slave: master
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'xtesting-_-alpine-3.12-pull'
+    name: 'xtesting-_-alpine-3.13-pull'
     repo: _
     port:
     container: alpine
-    tag: '3.12'
+    tag: '3.13'
     slave: master
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
@@ -482,12 +482,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.12-rmi'
+            - name: 'xtesting-_-alpine-3.13-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.12-pull'
+            - name: 'xtesting-_-alpine-3.13-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting
@@ -573,12 +573,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.12-rmi'
+            - name: 'xtesting-_-alpine-3.13-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.12-pull'
+            - name: 'xtesting-_-alpine-3.13-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting