Add centos8 jobs to hicn and cicn.

Signed-off-by: Mauro Sardara <[email protected]>
Change-Id: I383542a94b29044b4191ea0db205c9d5574c6097
Signed-off-by: Mauro Sardara <[email protected]>

diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 5f618c6..df31eed 100644 (file)
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -25,7 +25,7 @@
       - ubuntu2004:
           repo-os-part: "ubuntu.focal.main"
       - centos7:
-          repo-os-part: "centos7"
+          repo-os-part: "centos8"
 
     executor-arch: "x86_64"
 

diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 665ae22..15f66ac 100644 (file)
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -12,6 +12,29 @@
 # limitations under the License.
 
 ---
+- project:
+    name: hicn-os-eol-x86_64
+    jobs:
+      - "hicn-verify-{stream}-{os}-{executor-arch}"
+      - "hicn-merge-{stream}-{os}-{executor-arch}"
+
+    project: "hicn"
+    os:
+      - centos7:
+          repo-os-part: "centos7"
+
+    executor-arch: "x86_64"
+
+    stream:
+      - "2009":
+          branch: "stable/2009"
+          repo-stream-part: "stable.2009"
+          repository-name: "hicn"
+      - "2005":
+          branch: "stable/2005"
+          repo-stream-part: "stable.2005"
+          repository-name: "hicn"
+
 - project:
     name: hicn-x86_64
     jobs:
@@ -24,24 +47,41 @@
           repo-os-part: "ubuntu.bionic.main"
       - ubuntu2004:
           repo-os-part: "ubuntu.focal.main"
-      - centos7:
-          repo-os-part: "centos7"
 
     executor-arch: "x86_64"
 
     stream:
-      - master:
+      - "master":
           branch: "master"
           repo-stream-part: "master"
           repository-name: "hicn"
+      - "2009":
+          branch: "stable/2009"
+          repo-stream-part: "stable.2009"
+          repository-name: "hicn"
       - "2005":
           branch: "stable/2005"
           repo-stream-part: "stable.2005"
           repository-name: "hicn"
 
-    type:
-      - short
-      - long
+- project:
+    name: hicn-os-in-master-x86_64
+    jobs:
+      - "hicn-verify-{stream}-{os}-{executor-arch}"
+      - "hicn-merge-{stream}-{os}-{executor-arch}"
+
+    project: "hicn"
+    os:
+      - centos8:
+          repo-os-part: "centos8"
+
+    executor-arch: "x86_64"
+
+    stream:
+      - "master":
+          branch: "master"
+          repo-stream-part: "master"
+          repository-name: "hicn"
 
 - project:
     name: hicn-aarch64
@@ -67,10 +107,6 @@
           repo-stream-part: "stable.2005"
           repository-name: "hicn"
 
-    type:
-      - short
-      - long
-
 - project:
     name: hicn-beta-x86_64
     jobs:
@@ -82,8 +118,8 @@
           repo-os-part: "ubuntu.bionic.main"
       - ubuntu2004:
           repo-os-part: "ubuntu.focal.main"
-      - centos7:
-          repo-os-part: "centos7"
+      - centos8:
+          repo-os-part: "centos8"
 
     executor-arch: "x86_64"
 
@@ -92,10 +128,6 @@
           branch: "hicn-light-ng"
           repo-stream-part: "hicn-light-ng"
 
-    type:
-      - short
-      - long
-
 - project:
     name: hicn-beta-aarch64
     jobs:
@@ -113,10 +145,6 @@
           branch: "hicn-light-ng"
           repo-stream-part: "hicn-light-ng"
 
-    type:
-      - short
-      - long
-
 - project:
     name: hicn-misc
     jobs:
@@ -145,8 +173,8 @@
           repo-os-part: "ubuntu.bionic.main"
       - ubuntu2004:
           repo-os-part: "ubuntu.focal.main"
-      - centos7:
-          repo-os-part: "centos7"
+      - centos8:
+          repo-os-part: "centos8"
 
     executor-arch: "x86_64"
 
@@ -155,10 +183,6 @@
           branch: "master"
           repo-stream-part: "master"
 
-    type:
-      - short
-      - long
-
 - project:
     name: hicn-extras-aarch64
     jobs:
@@ -177,10 +201,6 @@
           branch: "master"
           repo-stream-part: "master"
 
-    type:
-      - short
-      - long
-
 - project:
     name: hicn-view
     views: