Remove deprecated releases/os jobs for VPP 21.10

- Deprecated release: VPP stable/2009, stable/2101
- Deprecated OS: centos-7, debian-9

Change-Id: If3ca0f249210946321f6e867a933b05f19f58865
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 1dc6d44..901a9ed 100644 (file)
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -12,31 +12,6 @@
 # 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:
-      - ubuntu1804:
-          repo-os-part: "ubuntu.bionic.main"
-      - 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:
@@ -59,14 +34,6 @@
           branch: "stable/2101"
           repo-stream-part: "stable.2101"
           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"
 
 - project:
     name: hicn-aarch64
@@ -139,14 +106,6 @@
           branch: "stable/2101"
           repo-stream-part: "stable.2101"
           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"
       - lightng:
           branch: "hicn-light-ng"
           repo-stream-part: "hicn-light-ng"

diff --git a/jjb/scripts/post_build_executor_info.sh b/jjb/scripts/post_build_executor_info.sh
index fef7981..f986666 100755 (executable)
--- a/jjb/scripts/post_build_executor_info.sh
+++ b/jjb/scripts/post_build_executor_info.sh
@@ -45,14 +45,3 @@ if [ -n "$(which ccache)" ] ; then
 fi
 
 echo "$long_line"
-
-# Avoid sar anomaly on centos-7 in global-jjb/shell/logs-deploy.sh
-#
-# Note: VPP 20.09 will be removed in the next release cycle (21.10),
-#       therefore this hack is better than polluting the docker image
-#       build scripts with code to avoid installing sysstat on centos-7.
-#
-# TODO: Remove when vpp-*-2009-centos7-x86_64 jobs are removed
-if [ "$OS_ID" = "centos" ] && [ "$OS_VERSION_ID" = "7"  ] ; then
-    sudo yum remove -y sysstat >& /dev/null || true
-fi

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 3c33227..f8676f6 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -13,12 +13,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2009':
-          branch: 'stable/2009'
-          branch-refspec: ''
-      - '2101':
-          branch: 'stable/2101'
-          branch-refspec: ''
       - '2106':
           branch: 'stable/2106'
           branch-refspec: ''

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index d5a4bb1..f5164aa 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -38,12 +38,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2009':
-          branch: 'stable/2009'
-          branch-refspec: ''
-      - '2101':
-          branch: 'stable/2101'
-          branch-refspec: ''
       - '2106':
           branch: 'stable/2106'
           branch-refspec: ''
@@ -74,14 +68,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2009':
-          branch: 'stable/2009'
-          branch-refspec: ''
-          make-test-os: 'ubuntu-18.04'
-      - '2101':
-          branch: 'stable/2101'
-          branch-refspec: ''
-          make-test-os: 'ubuntu-18.04'
       - '2106':
           branch: 'stable/2106'
           branch-refspec: ''
@@ -89,45 +75,24 @@
           branch: 'stable/2110'
           branch-refspec: ''
     os:
-      - centos7
       - centos8
-      - debian9
       - debian10
       - ubuntu1804
       - ubuntu2004
     executor-arch: 'x86_64'
     exclude:
       # OS deprecated in master
-      - stream: 'master'
-        os: 'centos7'
       - stream: 'master'
         os: 'centos8'
-      - stream: 'master'
-        os: 'debian9'
-      # OS deprecated on 2106
-      - stream: '2106'
-        os: 'centos7'
-      - stream: '2106'
-        os: 'debian9'
       # OS deprecated on 2110
-      - stream: '2110'
-        os: 'centos7'
       - stream: '2110'
         os: 'centos8'
-      - stream: '2110'
-        os: 'debian9'
-      # 2009 LTS supports all OS variants
-      # OS deprecated in 2101
-      - stream: '2101'
-        os: 'centos7'
-      - stream: '2101'
-        os: 'debian9'
 # [end] VPP-X86_64 PROJECT
 
 # VPP-DEBUG-X86_64 PROJECT
 #
 # Currently a periodic job due to intermittent failures.
-# Limiting branches to master and 2009, since other branches
+# Limiting branches to master, since other branches
 # may not get fixes for the intermittent failures.
 #
 - project:
@@ -160,12 +125,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2009':
-          branch: 'stable/2009'
-          branch-refspec: ''
-      - '2101':
-          branch: 'stable/2101'
-          branch-refspec: ''
       - '2106':
           branch: 'stable/2106'
           branch-refspec: ''
@@ -195,14 +154,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2009':
-          branch: 'stable/2009'
-          branch-refspec: ''
-          make-test-os: 'ubuntu-18.04'
-      - '2101':
-          branch: 'stable/2101'
-          branch-refspec: ''
-          make-test-os: 'ubuntu-18.04'
       - '2106':
           branch: 'stable/2106'
           branch-refspec: ''
@@ -221,11 +172,6 @@
       # OS deprecated in 2110
       - stream: '2110'
         os: 'centos8'
-      # OS introduced after 2009
-      - stream: '2009'
-        os: 'centos8'
-      - stream: '2009'
-        os: 'ubuntu2004'
 # [end] VPP-AARCH64 PROJECT
 
 # VPP-CSIT-VERIFY-DEVICE PROJECT
@@ -242,8 +188,8 @@
           skip-vote: 'true'
           comment-trigger-value: 'devicetest-periodic'
           exclude:
-            - stream: '2009'
-            - stream: '2101'
+            - stream: '2106'
+            - stream: '2110'
             - testbed-arch: '1n-skx'
     project: 'vpp'
     skip-vote: 'false'
@@ -251,12 +197,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2009':
-          branch: 'stable/2009'
-          branch-refspec: ''
-      - '2101':
-          branch: 'stable/2101'
-          branch-refspec: ''
       - '2106':
           branch: 'stable/2106'
           branch-refspec: ''
@@ -284,12 +224,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2009':
-          branch: 'stable/2009'
-          branch-refspec: ''
-      - '2101':
-          branch: 'stable/2101'
-          branch-refspec: ''
       - '2106':
           branch: 'stable/2106'
           branch-refspec: ''
@@ -341,12 +275,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2009':
-          branch: 'stable/2009'
-          branch-refspec: ''
-      - '2101':
-          branch: 'stable/2101'
-          branch-refspec: ''
       - '2106':
           branch: 'stable/2106'
           branch-refspec: ''