summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------global-jjb0
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg2
-rw-r--r--jjb/ci-management/packagecloud-repo-cleanup.sh4
-rw-r--r--jjb/ci-management/packagecloud-repo-cleanup.yaml32
-rw-r--r--jjb/csit/csit-perf.yaml12
-rw-r--r--jjb/csit/csit-tox.yaml2
-rw-r--r--jjb/csit/csit-vpp-device.yaml11
-rw-r--r--jjb/csit/csit.yaml2
-rw-r--r--jjb/global-defaults.yaml3
-rw-r--r--jjb/scripts/vpp/debug-build.sh6
-rw-r--r--jjb/vpp/vpp.yaml4
11 files changed, 33 insertions, 45 deletions
diff --git a/global-jjb b/global-jjb
-Subproject 168bf7cebd8b6619449eaa9e7f150fc95b85c87
+Subproject 413bdb2e77dcc2055e05476930f13874a2fae24
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
index cd525a78f..f0c8fad11 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
@@ -6,7 +6,7 @@ CLOUD_ZONE=ca-ymq-1
OS_CLOUD=vexci
# Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200315-024729.521
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
VOLUME_SIZE=20
HARDWARE_ID=v2-highcpu-2
NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03
diff --git a/jjb/ci-management/packagecloud-repo-cleanup.sh b/jjb/ci-management/packagecloud-repo-cleanup.sh
index 8fdfe1187..d664ae3ab 100644
--- a/jjb/ci-management/packagecloud-repo-cleanup.sh
+++ b/jjb/ci-management/packagecloud-repo-cleanup.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+echo "---> jjb/ci-management/packagecloud-repo-cleanup.sh"
+
set -euo pipefail
# Number of packages to keep.
@@ -158,4 +160,4 @@ build_package_blacklist () {
setup_fdio_repo
PACKAGES_TO_PROMOTE=$(build_package_blacklist ${PACKAGE_LIST})
-promote_to_attic_repo ${PACKAGES_TO_PROMOTE} \ No newline at end of file
+promote_to_attic_repo ${PACKAGES_TO_PROMOTE}
diff --git a/jjb/ci-management/packagecloud-repo-cleanup.yaml b/jjb/ci-management/packagecloud-repo-cleanup.yaml
index c64e24a08..7b8dae452 100644
--- a/jjb/ci-management/packagecloud-repo-cleanup.yaml
+++ b/jjb/ci-management/packagecloud-repo-cleanup.yaml
@@ -1,19 +1,29 @@
- project:
- name: packagecloud-repo-cleanup
+ name: packagecloud-repo-cleanup-x86_64
jobs:
- - 'packagecloud-repo-cleanup-release-{os}'
- - 'packagecloud-repo-cleanup-hicn-{os}'
+ - 'packagecloud-repo-cleanup-release-{os}-{executor-arch}'
+ - 'packagecloud-repo-cleanup-hicn-{os}-{executor-arch}'
project: 'ci-management'
os:
- ubuntu1804:
repo-os-part: 'ubuntu.bionic.main'
- - ubuntu1804arm:
- repo-os-part: 'ubuntu-arm.bionic.main'
- - ubuntu1604:
- repo-os-part: 'ubuntu.xenial.main'
- centos7:
repo-os-part: 'centos7'
+ executor-arch: "x86_64"
+
+- project:
+ name: packagecloud-repo-cleanup-aarch64
+ jobs:
+ - 'packagecloud-repo-cleanup-release-{os}-{executor-arch}'
+ - 'packagecloud-repo-cleanup-hicn-{os}-{executor-arch}'
+ project: 'ci-management'
+ os:
+ - ubuntu1804:
+ repo-os-part: 'ubuntu-arm.bionic.main'
+
+ executor-arch: "aarch64"
+
- project:
name: packagecloud-view
views:
@@ -21,10 +31,10 @@
project-name: packagecloud
- job-template:
- name: 'packagecloud-repo-cleanup-release-{os}'
+ name: 'packagecloud-repo-cleanup-release-{os}-{executor-arch}'
project-type: freestyle
- node: '{os}-us'
+ node: 'builder-{os}-prod-{executor-arch}'
concurrent: true
build-discarder:
@@ -83,10 +93,10 @@
maven-version: 'mvn36'
- job-template:
- name: 'packagecloud-repo-cleanup-hicn-{os}'
+ name: 'packagecloud-repo-cleanup-hicn-{os}-{executor-arch}'
project-type: freestyle
- node: '{os}-us'
+ node: 'builder-{os}-prod-{executor-arch}'
concurrent: true
build-discarder:
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index d2dd176fe..057f12598 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -54,12 +54,6 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '1908_1':
- branch: 'rls1908_1'
- branch-id: 'oper-rls1908_1'
- - '1908_2':
- branch: 'rls1908_2'
- branch-id: 'oper-rls1908_2'
- '2005':
branch: 'rls2005'
branch-id: 'oper-rls2005'
@@ -97,9 +91,6 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '1908_2':
- branch: 'rls1908_2'
- branch-id: 'oper-rls1908_2'
- '2009_lts':
branch: 'rls2009_lts'
branch-id: 'oper-rls2009_lts'
@@ -166,9 +157,6 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '1908_2':
- branch: 'rls1908_2'
- branch-id: 'oper-rls1908_2'
- '2005':
branch: 'rls2005'
branch-id: 'oper-rls2005'
diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index 9075bff06..efb8bbdd4 100644
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -23,8 +23,6 @@
stream:
- master:
branch: 'master'
- - '1908_2':
- branch: 'rls1908_2'
- '2005':
branch: 'rls2005'
- '2009':
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index d4dcdd34d..4f2fd7869 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -29,9 +29,6 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '1908_2':
- branch: 'rls1908_2'
- branch-id: 'oper-rls1908_2'
- '2009_lts':
branch: 'rls2009_lts'
branch-id: 'oper-rls2009_lts'
@@ -40,9 +37,6 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '1908_2':
- branch: 'rls1908_2'
- branch-id: 'oper-rls1908_2'
- '2009_lts':
branch: 'rls2009_lts'
branch-id: 'oper-rls2009_lts'
@@ -55,9 +49,6 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '1908_2':
- branch: 'rls1908_2'
- branch-id: 'oper-rls1908_2'
- '2005':
branch: 'rls2005'
branch-id: 'oper-rls2005'
@@ -68,8 +59,6 @@
branch: 'rls2009_lts'
branch-id: 'oper-rls2009_lts'
exclude:
- - stream: '1908_2'
- node-arch: '1n-tx2'
- stream: '2005'
node-arch: '1n-tx2'
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index ad8c016d0..0d5c4ac48 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -30,8 +30,6 @@
stream:
- master:
branch: 'master'
- - '1908_2':
- branch: 'rls1908_2'
- '2005':
branch: 'rls2005'
- '2009':
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index d77b53d7d..b4998a3a5 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -12,6 +12,9 @@
build-timeout: 360
build-perf-timeout: 5760
+ failure-notification: "releng+fdio@linuxfoundation.org"
+ failure-notification-prefix: "[releng]"
+
# global-jjb
gerrit-server-name: Primary
jenkins-ssh-credential: jenkins-gerrit-credentials
diff --git a/jjb/scripts/vpp/debug-build.sh b/jjb/scripts/vpp/debug-build.sh
index e7f185218..a9887340d 100644
--- a/jjb/scripts/vpp/debug-build.sh
+++ b/jjb/scripts/vpp/debug-build.sh
@@ -25,11 +25,11 @@ echo "sha1sum of this script: ${0}"
sha1sum $0
# run with ASAN on
-# export VPP_EXTRA_CMAKE_ARGS='-DVPP_ENABLE_SANITIZE_ADDR=ON'
+export VPP_EXTRA_CMAKE_ARGS='-DVPP_ENABLE_SANITIZE_ADDR=ON'
# clang is not working with ASAN right now - see change 27268
-# apparently gcc neither...
-# export CC=gcc
+# also, it does not work with gcc-7, we need gcc-8 at least
+# on ubuntu 20.04 executor the gcc is gcc9
make UNATTENDED=yes install-dep
make UNATTENDED=yes install-ext-deps
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 647401dc6..93f1157aa 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -181,8 +181,8 @@
repo-stream-part: 'stable.2009'
branch-head-refspec: ''
os:
- - ubuntu1804:
- repo-os-part: 'ubuntu.bionic.main'
+ - ubuntu2004:
+ repo-os-part: 'ubuntu.focal.main'
executor-arch: 'x86_64'
# [end] VPP-DEBUG-X86_64 PROJECT