Merge "Remove Guilin jobs for ccsdk,sdnc"

diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index d05996f..60d74c9 100644 (file)
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -16,6 +16,7 @@
     platforms:
       - centos-7
       - ubuntu-18.04
+      - ubuntu-20.04
     templates: builder
     update-cloud-image: true
 
@@ -37,6 +38,8 @@
       - centos-7
       - ubuntu-18.04-arm64
       - ubuntu-18.04
+      - ubuntu-20.04
+      - ubuntu-20.04-arm64
     templates: docker
     update-cloud-image: true
 
@@ -56,6 +59,7 @@
 
     platforms:
       - ubuntu-18.04
+      - ubuntu-20.04
     templates: memcached
     update-cloud-image: true
 
@@ -92,5 +96,6 @@
 
     platforms:
       - ubuntu-18.04
+      - ubuntu-20.04
     templates: helm
     update-cloud-image: true

diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index d03fee0..7bdd671 100644 (file)
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -11,9 +11,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'guilin':
-          branch: 'guilin'
-          java-version: openjdk11
       - 'honolulu':
           branch: 'honolulu'
           java-version: openjdk11

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index c7d7bb7..9846475 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -16,9 +16,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'guilin':
-          branch: 'guilin'
-          java-version: openjdk11
       - 'honolulu':
           branch: 'honolulu'
           java-version: openjdk11
@@ -72,4 +69,3 @@
     build-node: centos7-builder-2c-1g
     project: so/libs
     branch: master
-    branch: guilin