Merge changes from topic '75395'

* changes:
  Ensure autorelease pull submodule HEAD of branch
  Update CentOS 7 builder to pick up new git version

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
index eef00fc3c027341eb48e00b734daa9c264a13a2b..3732ebd4cea169eb187188b062dceb7df6782496 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 VOLUME_SIZE=150
 HARDWARE_ID=odl-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg
index 6b6e7950188f04bfd04831705fea2b2be376cdbd..caf98e7fde9bb1203fd4f9124371e347fa4601b0 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 VOLUME_SIZE=150
 HARDWARE_ID=odl-standard-8

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
index bfba06ad33c02639f6584de80773a7d4f14fe561..94ce68f349682c08fa1ccc4b2c248a54b69d26f4 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 VOLUME_SIZE=150
 HARDWARE_ID=odl-highcpu-8

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
index 801537908cfa0ff2095215d769dfddbfee7d4c7f..4deec3b3669518967ba53b7e2779c3ce980dbbe5 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=v1-standard-1

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
index b427a79085b6dc494caf2d4648f3c38445a34023..c1bd86443d81009aa09dd9e4c54d60f96218edef 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
index 98c246af22cabf503c3fe7c49095d15e2bd84eb2..c72b9aa052280fe026680d15c083744c4be05865 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=odl-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
index f40f2d88bb9e18a7742fc9af43097ae00f190b0b..107592b269fe27a25e35da977326e102ed7f20f5 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=odl-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
index e943f33b7be367a56bd2ac255884ca0be45a1d61..b078b81d6f44fdb3081fb095b015028d37f48828 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=odl-highcpu-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
index 4ffea7f22443fd0b2aedad05c64554805860cc03..52246911f6aa960b0613cc523df8c9dc3bf2ed5e 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=odl-highcpu-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 93e04006a655703069816693dc326c92bf0120e9..ca6ef5f939d63e39c1f6422e587faa9560ae96ec 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 3be1513529649eedc27b0137d0f2679fe0bcca72..7818f8045d759551a6b5cb73e8667c8a73c21e2a 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -6,6 +6,7 @@
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}':
           build-node: centos7-autorelease-8c-32g
+      - 'autorelease-update-submodules-{stream}'
       - 'autorelease-update-validate-jobs-{stream}'
       - 'autorelease-version-bump-{stream}':
           build-node: centos7-autorelease-8c-32g

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index c6774da9c86da206b30b1ae8729d133a8466cf86..5280e00a3292df4bae64ee20acab2f547f783029 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -204,6 +204,68 @@
           mark-unstable-if-failed: false
       - lf-infra-publish
 
+- job-template:
+    name: 'autorelease-update-submodules-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    cron: 'H 0 * * *'
+
+    #####################
+    # Job configuration #
+    #####################
+
+    project-type: freestyle
+    node: centos7-builder-2c-2g
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - lf-infra-parameters:
+          project: releng/autorelease
+          branch: '{branch}'
+          stream: '{stream}'
+          refspec: 'refs/heads/{branch}'
+          lftools-version: '{lftools-version}'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          git-url: '$GIT_URL/$GERRIT_PROJECT'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-recursive: true
+          choosing-strategy: default
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 10
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+
+    triggers:
+      - timed: '{obj:cron}'
+
+    builders:
+      # Fetch latest head of branch
+      - shell: |
+          git checkout $GERRIT_BRANCH
+          git submodule update --remote
+          git add .
+      - lf-infra-push-gerrit-patch:
+          project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
+          gerrit-topic: 'autorelease-update-submodules'
+          gerrit-commit-message: 'Update submodules to latest HEAD of branch'
+          reviewers-email: ''
+
+    publishers:
+      - lf-infra-publish
+
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
 

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 7c4b4f9a96e7edc3d2dbae52bed670accf48017e..8d5b4f0ae98af9935658df6573fae6b069c47b34 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -96,7 +96,7 @@
     docker_system_image: ZZCI - CentOS 7 - docker - 20180723-235456.035
     odl_system_count: 1
     odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180802-220823.782
+    odl_system_image: ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
     openstack_system_count: 1
     openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20180723-235345.727