summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/ci-management/ci-management-jobs.yaml3
-rw-r--r--jjb/csit/csit-perf.yaml3
-rw-r--r--jjb/scripts/packagecloud_push.sh28
-rw-r--r--jjb/vpp/vpp.yaml65
4 files changed, 76 insertions, 23 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index e99855eb..10cb8938 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -6,7 +6,8 @@
- gerrit-jenkins-cfg-merge
- gerrit-jenkins-sandbox-cleanup
- gerrit-jjb-deploy-job
- - gerrit-jjb-merge
+ - gerrit-jjb-merge:
+ build-node: centos7-builder-8c-8g
- gerrit-jjb-verify
project: ci-management
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index dc8cb2ee..b18c0f09 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -34,6 +34,7 @@
- ''
- -2n-clx
- -2n-skx
+ - -2n-zn2
- -3n-skx
- -3n-tsh:
executor: 'ubuntu1804arm-us'
@@ -78,6 +79,8 @@
periodicity: '0 2,14 * * *'
- -2n-dnv:
periodicity: '0 2,14 * * *'
+ - -2n-zn2:
+ periodicity: '0 2,14 * * *'
- -3n-skx:
periodicity: '0 2,14 * * *'
- -3n-dnv:
diff --git a/jjb/scripts/packagecloud_push.sh b/jjb/scripts/packagecloud_push.sh
index 6af2f512..af3bf48f 100644
--- a/jjb/scripts/packagecloud_push.sh
+++ b/jjb/scripts/packagecloud_push.sh
@@ -23,6 +23,7 @@ sleep 10
FACTER_OS=$(/usr/bin/facter operatingsystem)
push_cmd=""
+push_ext_deps_cmd=""
# PCIO_CO and SILO are Jenkins Global Environment variables defined in
# .../ci-management/jenkins-config/global-vars-*.sh
@@ -30,19 +31,31 @@ if [ -f ~/.packagecloud ]; then
case "$FACTER_OS" in
Debian)
FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename)
- DEBS=$(find . -type f -iname '*.deb')
+ DEBS=$(find . -type f -iname '*.deb' | grep -v vpp-ext-deps)
push_cmd="package_cloud push ${PCIO_CO}/${STREAM}/debian/${FACTER_LSBNAME}/main/ ${DEBS}"
+ EXT_DEPS_DEB=$(find . -type f -iname 'vpp-ext-deps*.deb')
+ if [ -n "$EXT_DEPS_DEB" ] ; then
+ push_ext_deps_cmd="package_cloud push ${PCIO_CO}/${STREAM}/debian/${FACTER_LSBNAME}/main/ ${EXT_DEPS_DEB}"
+ fi
;;
Ubuntu)
FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename)
- DEBS=$(find . -type f -iname '*.deb')
+ DEBS=$(find . -type f -iname '*.deb' | grep -v vpp-ext-deps)
push_cmd="package_cloud push ${PCIO_CO}/${STREAM}/ubuntu/${FACTER_LSBNAME}/main/ ${DEBS}"
+ EXT_DEPS_DEB=$(find . -type f -iname 'vpp-ext-deps*.deb')
+ if [ -n "$EXT_DEPS_DEB" ] ; then
+ push_ext_deps_cmd="package_cloud push ${PCIO_CO}/${STREAM}/ubuntu/${FACTER_LSBNAME}/main/ ${EXT_DEPS_DEB}"
+ fi
;;
CentOS)
FACTER_OSMAJREL=$(/usr/bin/facter operatingsystemmajrelease)
FACTER_ARCH=$(/usr/bin/facter architecture)
- RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm')
+ RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep -v vpp-ext-deps)
push_cmd="package_cloud push ${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/ ${RPMS}"
+ EXT_DEPS_RPM=$(find . -type f -iname 'vpp-ext-deps*.rpm')
+ if [ -n "$EXT_DEPS_RPM" ] ; then
+ push_ext_deps_cmd="package_cloud push ${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/ ${EXT_DEPS_RPM}"
+ fi
;;
*)
echo "ERROR: Unsupported OS '$FACTER_OS'"
@@ -52,8 +65,17 @@ if [ -f ~/.packagecloud ]; then
esac
if [ "${SILO,,}" = "sandbox" ] ; then
echo "SANDBOX: skipping '$push_cmd'"
+ if [ -n "$push_ext_deps_cmd" ] ; then
+ echo "SANDBOX: skipping '$push_ext_deps_cmd'"
+ fi
else
$push_cmd
+ if [ -n "$push_ext_deps_cmd" ] ; then
+ # Don't fail script if vpp-ext-deps push fails.
+ set +e
+ $push_ext_deps_cmd
+ set -e
+ fi
fi
else
echo "ERROR: Missing '~/.packagecloud' for user '$(id)'"
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index c518036e..b237c8db 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -72,10 +72,35 @@
os:
- ubuntu1804:
repo-os-part: 'ubuntu.bionic.main'
+ executor-arch: 'x86_64'
+# [end] VPP-X86_64 PROJECT
+
+# VPP-OS-EOL-X86_64 PROJECT
+- project:
+ name: vpp-os-eol-x86_64
+ jobs:
+ - 'vpp-verify-{stream}-{os}-{executor-arch}'
+ - 'vpp-merge-{stream}-{os}-{executor-arch}'
+ project: 'vpp'
+ make-parallel-jobs: '4'
+ stream:
+ - '1908':
+ branch: 'stable/1908'
+ repo-stream-part: 'stable.1908'
+ branch-head-refspec: ''
+ - '2005':
+ branch: 'stable/2005'
+ repo-stream-part: 'stable.2005'
+ branch-head-refspec: ''
+ - '2009':
+ branch: 'stable/2009'
+ repo-stream-part: 'stable.2009'
+ branch-head-refspec: ''
+ os:
- centos7:
repo-os-part: 'centos7'
executor-arch: 'x86_64'
-# [end] VPP-X86_64 PROJECT
+# [end] VPP-OS-EOL-X86_64 PROJECT
# VPP-OS-IN-2009-X86_64 PROJECT
#
@@ -114,6 +139,8 @@
repo-os-part: 'centos8'
- debian9:
repo-os-part: 'stretch'
+ - debian10:
+ repo-os-part: 'buster'
- ubuntu2004:
repo-os-part: 'ubuntu.focal.main'
executor-arch: 'x86_64'
@@ -158,24 +185,24 @@
# 'vpp-os-in-XXXX-x86_64' project. If no OSes are being
# tested then this project should be commented out.
#
-- project:
- name: vpp-beta-x86_64
- jobs:
- - 'vpp-beta-verify-{stream}-{os}-{executor-arch}':
- comment-trigger-value: 'vpp-beta-verify'
- - 'vpp-beta-merge-{stream}-{os}-{executor-arch}':
- comment-trigger-value: 'vpp-beta-merge'
- project: 'vpp'
- make-parallel-jobs: '4'
- stream:
- - master:
- branch: 'master'
- repo-stream-part: 'master'
- branch-head-refspec: ''
- os:
- - debian10:
- repo-os-part: 'buster'
- executor-arch: x86_64
+#- project:
+# name: vpp-beta-x86_64
+# jobs:
+# - 'vpp-beta-verify-{stream}-{os}-{executor-arch}':
+# comment-trigger-value: 'vpp-beta-verify'
+# - 'vpp-beta-merge-{stream}-{os}-{executor-arch}':
+# comment-trigger-value: 'vpp-beta-merge'
+# project: 'vpp'
+# make-parallel-jobs: '4'
+# stream:
+# - master:
+# branch: 'master'
+# repo-stream-part: 'master'
+# branch-head-refspec: ''
+# os:
+# - debian10:
+# repo-os-part: 'buster'
+# executor-arch: x86_64
# [end] VPP-BETA-X86_64 PROJECT
# VPP-GCC-X86_64 PROJECT