diff options
| -rw-r--r-- | jjb/hicn/hicn.yaml | 43 | ||||
| -rwxr-xr-x | jjb/scripts/post_build_executor_info.sh | 11 | ||||
| -rw-r--r-- | jjb/vpp/docs.yaml | 6 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 78 |
4 files changed, 4 insertions, 134 deletions
diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index 1dc6d44c..901a9edd 100644 --- 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: @@ -13,31 +13,6 @@ --- - 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: - "hicn-verify-{stream}-{os}-{executor-arch}" @@ -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 fef79814..f9866667 100755 --- 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 3c332275..f8676f6f 100644 --- 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 d5a4bb12..f5164aa8 100644 --- 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,9 +75,7 @@ branch: 'stable/2110' branch-refspec: '' os: - - centos7 - centos8 - - debian9 - debian10 - ubuntu1804 - ubuntu2004 @@ -99,35 +83,16 @@ 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: '' |