Merge "Update cloud image list docs"

diff --git a/global-jjb b/global-jjb
index 37f923f40d5a735f5bc67769ad1bcfb63c1abe3d..a86c6e8d376c95aa00b179fce9d207e61c8f72d0 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 37f923f40d5a735f5bc67769ad1bcfb63c1abe3d
+Subproject commit a86c6e8d376c95aa00b179fce9d207e61c8f72d0

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
index b33cc895f6abf4fc49200eb23000218482d0f029..f0837d815ac324516d5293f2e842a5d002cd3b66 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20211006-074156.707
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
index 582d64324cba3a5e603f7c6ed209899649d17018..843f23edd4daf7f65981e7da542c73474390f002 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20211006-074156.707
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
index 77c6c0ec57e21d7b0747e5ed7e3f1188470cb905..f439e4e5dc2118e826e2d29c187de332ffc88fda 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20211006-074156.707
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
index 1ea7e05f8e0ae8f6e53e33d66e173c1f5457f730..d695b972d255d9e992fbf8d9dfb8a93953945926 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20211006-074156.707
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
index 5c82920a205c3d054fc9a76778b58d3a9be09850..3dbe92b19211b9d143cb5ec81738bf7ada17fe02 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20211006-074156.707
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/global-vars-releng.sh b/jenkins-config/global-vars-releng.sh
index 66104cd33fe012d93b56e99ea09440f5be4eff3f..1da2fd269ed659b37e8ea6a348e10751b0120d92 100644 (file)
--- a/jenkins-config/global-vars-releng.sh
+++ b/jenkins-config/global-vars-releng.sh
@@ -6,7 +6,6 @@ GERRIT_URL=https://git.opendaylight.org/gerrit
 GIT_BASE=git://devvexx.opendaylight.org/mirror/$PROJECT
 GIT_URL=git://devvexx.opendaylight.org/mirror
 JENKINS_HOSTNAME=vex-yul-odl-jenkins-1
-LOGS_SERVER=https://logs.opendaylight.org
 NEXUS_URL=https://nexus.opendaylight.org
 ODLNEXUSPROXY=https://nexus.opendaylight.org
 REGISTRY_PORTS=10001 10002 10003 10004

diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index 290fc69c42bd8b2bf32c52192fbd5ac7ed39cd72..f32a5546caf19131be594dabf00bde514a8b3988 100644 (file)
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -6,7 +6,6 @@ GERRIT_URL=https://git.opendaylight.org/gerrit
 GIT_BASE=git://devvexx.opendaylight.org/mirror/$PROJECT
 GIT_URL=git://devvexx.opendaylight.org/mirror
 JENKINS_HOSTNAME=vex-yul-odl-jenkins-2
-LOGS_SERVER=https://logs.opendaylight.org
 NEXUS_URL=https://nexus.opendaylight.org
 ODLNEXUSPROXY=https://nexus.opendaylight.org
 REGISTRY_PORTS=10001 10002 10003 10004

diff --git a/jjb/autorelease/notify-build-failure.sh b/jjb/autorelease/notify-build-failure.sh
index 6eafef7b4383d1bf4687aec1876b03cc9d62ef4a..805a1fa8f093581af20532149440ddc4d3175d0b 100644 (file)
--- a/jjb/autorelease/notify-build-failure.sh
+++ b/jjb/autorelease/notify-build-failure.sh
@@ -107,7 +107,7 @@ Autorelease $STREAM failed to build $ARTIFACT_ID$PROJECT_STRING in build
 $BUILD_NUMBER. \${!ATTACHMENT} ${PROJECT:+${NEWLINE}${GROUPLIST}}
 
 Console Logs:
-https://logs.opendaylight.org/$SILO/$ARCHIVES_DIR
+https://s3-logs.opendaylight.org/logs/$SILO/$ARCHIVES_DIR
 
 Jenkins Build:
 $BUILD_URL

diff --git a/jjb/copy-sandbox-logs.sh b/jjb/copy-sandbox-logs.sh
index e3885e5897bc102e2728cf2ee00c9b586907356d..3edb1345dc1904aa31009dd276f28433d70ed0b7 100644 (file)
--- a/jjb/copy-sandbox-logs.sh
+++ b/jjb/copy-sandbox-logs.sh
@@ -19,7 +19,7 @@
 echo "---> copy-sandbox-logs.sh"
 
 build_path="$(echo "$GERRIT_EVENT_COMMENT_TEXT" | base64 -d | grep 'copy-logs:' | awk -F: '{print $2}' | tr -d '[:space:]')"
-fetch_url="https://logs.opendaylight.org/sandbox/vex-yul-odl-jenkins-2/$build_path"
+fetch_url="https://s3-logs.opendaylight.org/logs/sandbox/vex-yul-odl-jenkins-2/$build_path"
 
 COPY_DIR="$WORKSPACE/archives"
 mkdir -p "$COPY_DIR"

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index be081b88366d0d584851f57cbfdead1e786da62d..c72d953826e2fd56a292177e7d41baad9306ab97 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -129,7 +129,7 @@
     # Value for ODL_STREAM
     verify-stream: silicon
     verify-karaf-version: karaf4
-    verify-jdkversion: openjdk8
+    verify-jdkversion: openjdk11
 
     # Maven / Java
     java-version: "openjdk8"

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 21ee6b7bfd7dfbdf6f58e0ae3681baf421246084..4e9c74a4899ee8cfc3ccaf42d1772922cdadea4f 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -29,7 +29,9 @@
             **/hs_err_*.log
             **/target/feature/feature.xml
           # TODO: **/*.hprof is too large, compress with xz first
-          description: "Space separated glob patterns for artifacts to archive into logs.opendaylight.org"
+          description: |
+            Space separated glob patterns for artifacts to archive
+            into s3-logs.opendaylight.org/logs
       - string:
           name: GERRIT_PROJECT
           default: "{project}"
@@ -203,7 +205,7 @@
             and use the Jenkins Build URL as a last resort.
 
             Console Logs URL:
-            https://logs.opendaylight.org/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
+            https://s3-logs.opendaylight.org/logs/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
 
             Jenkins Build URL:
             $BUILD_URL