X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=3d5bd1d66ee4feb1d9153d7f1aa3747d81b93a1d;hb=0209f258540405a719e0bf9d89bfc9e7ebf9d647;hp=7e5138f08f15b3032967a02ffc3b32c5ad125e0e;hpb=63f117b7c2495aebdcbacd8d0e479cc4cc685eab;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 7e5138f08..3d5bd1d66 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -87,7 +87,7 @@
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
-          release-tag: '{next-release-tag}'
+          release-tag: '{stream}'
       - string:
           name: EXTRA_MVN_OPTS
           default: '{extra-mvn-opts}'
@@ -125,6 +125,7 @@
       - timed: '{cron}'
 
     builders:
+      - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -151,7 +152,7 @@
           goals: |
               clean deploy
               $EXTRA_MVN_OPTS
-              -Pintegrationtests,docs,repoBuild
+              -Pintegrationtests,repoBuild
               -Dcheckstyle.skip=true
               -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
               {opendaylight-infra-mvn-opts}
@@ -183,13 +184,6 @@
           - project: 'integration-distribution-test-{integration-test}'
             condition: FAILED
             trigger-with-no-params: true
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: UNSTABLE_OR_BETTER
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: FAILED
-            trigger-with-no-params: true
           - project: 'packaging-build-rpm-{stream}'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
@@ -211,6 +205,69 @@
           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:
+      - lf-infra-pre-build
+      # 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}
 
@@ -271,13 +328,17 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
+      - lf-infra-pre-build
       - autorelease-update-project-views
       - autorelease-update-validate-projects
-      - opendaylight-infra-push-gerrit-patch:
-          project: 'releng/builder'
+      - lf-infra-push-gerrit-patch:
+          project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
           gerrit-commit-message: |
-              Update validate autorelease projects for {stream}
+              'Update validate autorelease projects for {stream}'
+          reviewers-email: 'jenkins-releng@opendaylight.org'
 
     publishers:
       - lf-infra-publish
@@ -300,7 +361,7 @@
           lftools-version: '{lftools-version}'
       - string:
           name: RELEASE_TAG
-          default: '{next-release-tag}'
+          default: '{stream}'
           description: |
               Release that is being version bumped.
               Eg. Lithium, Beryllium, Boron, Carbon, Carbon-SR1, Carbon-SR2...
@@ -336,6 +397,7 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
+      - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
       - maven-target:
           maven-version: mvn35
@@ -346,7 +408,6 @@
           global-settings-type: cfp
       - autorelease-cfp
       - shell: !include-raw-escape:
-          - ../global-jjb/shell/lftools-install.sh
           - version-bump.sh
 
     publishers:
@@ -410,6 +471,7 @@
                   branch-pattern: '**/{branch}'
 
     builders:
+      - lf-infra-pre-build
       - autorelease-generate-release-notes
 
     publishers:
@@ -475,8 +537,10 @@
           project: '{project}'
           branch: '{branch}'
           files: '**/*.xml'
+          forbidden-files: ''
 
     builders:
+      - lf-infra-pre-build
       - autorelease-checkout-gerrit-patch
       - autorelease-compare-projects
       - jacoco-nojava-workaround
@@ -502,8 +566,6 @@
           settings-type: cfp
           global-settings: global-settings
           global-settings-type: cfp
-      # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease
-      - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom || true
       - maven-target:
           maven-version: mvn35
           pom: pom.xml