From 7fbcd97a05335491ecf0ee503d02982af0421146 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 1 Mar 2017 22:34:14 -0500 Subject: [PATCH] Fix yamllint for autorelease Preparation for patch Icd1b8d4931e15b77ee29aa179422cd652e43f2e5 Change-Id: I8de711431bad79a144c67fbb1c0d5860c9e016b1 Signed-off-by: Thanh Ha --- jjb/autorelease/autorelease-macros.yaml | 134 ++++--- jjb/autorelease/autorelease-projects.yaml | 343 +++++++++--------- jjb/autorelease/autorelease-templates.yaml | 284 ++++++++------- .../autorelease-version-management.yaml | 7 +- 4 files changed, 388 insertions(+), 380 deletions(-) diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 86f981eed2..3e3008d310 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -1,51 +1,52 @@ +--- # Macros for the AutoRelease project - parameter: name: autorelease-release-tag parameters: - - string: - name: RELEASE_TAG - default: '{release-tag}' - description: "The Release train tag to use eg. Beryllium-SR1" + - string: + name: RELEASE_TAG + default: '{release-tag}' + description: "The Release train tag to use eg. Beryllium-SR1" - parameter: name: autorelease-release-branch parameters: - - string: - name: RELEASE_BRANCH - default: '{release-branch}' - description: "The Release train branch to base build off eg. stable/beryllium" + - string: + name: RELEASE_BRANCH + default: '{release-branch}' + description: "The Release train branch to base build off eg. stable/beryllium" - wrapper: name: autorelease-build-timeout wrappers: - - timeout: - type: absolute - timeout: 1440 - fail: true + - timeout: + type: absolute + timeout: 1440 + fail: true - builder: name: autorelease-checkout-gerrit-patch builders: - - shell: | - cd ${GERRIT_PROJECT} - echo "Checking out ${GERRIT_PROJECT} patch ${GERRIT_REFSPEC}..." - git fetch origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD - cd .. + - shell: | + cd ${GERRIT_PROJECT} + echo "Checking out ${GERRIT_PROJECT} patch ${GERRIT_REFSPEC}..." + git fetch origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD + cd .. - builder: name: autorelease-cfp builders: - - config-file-provider: - files: - - file-id: 'autorelease-settings' - variable: 'SETTINGS_FILE' - - file-id: 'odl-global-settings' - variable: 'GLOBAL_SETTINGS_FILE' + - config-file-provider: + files: + - file-id: 'autorelease-settings' + variable: 'SETTINGS_FILE' + - file-id: 'odl-global-settings' + variable: 'GLOBAL_SETTINGS_FILE' - builder: name: autorelease-determine-merge-order builders: - - shell: | + - shell: | # TODO: Remove this condition once stable/beryllium is no longer # officially maintained. if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then @@ -62,82 +63,80 @@ - builder: name: autorelease-maven-deploy builders: - - shell: - !include-raw: - - include-raw-autorelease-maven-deploy.sh + - shell: !include-raw: include-raw-autorelease-maven-deploy.sh - builder: name: autorelease-maven-sources builders: - - maven-target: - maven-version: '{maven-version}' - pom: 'pom.xml' - goals: '--quiet dependency:sources -DoutputFile=$WORKSPACE/sources.log -DappendOutput -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' - java-opts: - - '-Xmx4096m -XX:MaxPermSize=1024m' - settings: '{settings}' - settings-type: cfp - global-settings: '{global-settings}' - global-settings-type: cfp + - maven-target: + maven-version: '{maven-version}' + pom: 'pom.xml' + goals: > + --quiet dependency:sources + -DoutputFile=$WORKSPACE/sources.log + -DappendOutput + -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r + java-opts: + - '-Xmx4096m -XX:MaxPermSize=1024m' + settings: '{settings}' + settings-type: cfp + global-settings: '{global-settings}' + global-settings-type: cfp - builder: name: autorelease-maven-sources-post-process builders: - - shell: | - awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log + - shell: | + awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log - builder: name: autorelease-generate-taglist builders: - - shell: | - echo autorelease `git rev-parse --verify HEAD` ${RELEASE_TAG} | tee -a $WORKSPACE/taglist.log - git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} | tee -a $WORKSPACE/taglist.log' + - shell: | + echo autorelease `git rev-parse --verify HEAD` ${RELEASE_TAG} \ + | tee -a $WORKSPACE/taglist.log + git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} \ + | tee -a $WORKSPACE/taglist.log' - builder: name: autorelease-distribute-taglist builders: - - shell: | - if [ -d "integration/distribution/distributions" ]; then - cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distributions/karaf/src/main/assembly/" - else - cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distribution-karaf/src/main/assembly/" - fi + - shell: | + if [ -d "integration/distribution/distributions" ]; then + cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distributions/karaf/src/main/assembly/" + else + cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distribution-karaf/src/main/assembly/" + fi - builder: name: autorelease-generate-release-patches builders: - - shell: - !include-raw: - - include-raw-autorelease-release-versions.sh + - shell: !include-raw: include-raw-autorelease-release-versions.sh - builder: name: autorelease-sys-stats builders: - - shell: | - uname -a - df -h + - shell: | + uname -a + df -h - builder: name: autorelease-get-integration-test-variables builders: - - shell: - !include-raw: - - include-raw-autorelease-get-integration-test-variables.sh - - inject: - properties-file: variables.prop + - shell: !include-raw: include-raw-autorelease-get-integration-test-variables.sh + - inject: + properties-file: variables.prop - builder: name: autorelease-generate-project-report builders: - - shell: - !include-raw: - - include-raw-generate-project-report.sh + - shell: !include-raw: include-raw-generate-project-report.sh - builder: name: autorelease-fix-relative-paths builders: - - shell: | - ./scripts/fix-relativepaths.sh + - shell: | + ./scripts/fix-relativepaths.sh - publisher: # include-raw-autorelease-notify-build-failure.sh searches console log for @@ -146,7 +145,6 @@ publishers: - postbuildscript: builders: - - shell: - !include-raw: include-raw-autorelease-notify-build-failure.sh - script-only-if-succeeded: False - script-only-if-failed: True + - shell: !include-raw: include-raw-autorelease-notify-build-failure.sh + script-only-if-succeeded: 'False' + script-only-if-failed: 'True' diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index d9ad7db79a..6eddc0dbf3 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -1,25 +1,26 @@ +--- - project: name: autorelease-projects jobs: - - 'autorelease-release-{stream}' - - 'autorelease-project-report-{stream}' + - 'autorelease-release-{stream}' + - 'autorelease-project-report-{stream}' stream: - - carbon: - next-release-tag: Carbon - branch: 'master' - jdk: 'openjdk8' - integration-test: carbon - - boron: - next-release-tag: Boron-SR3 - branch: 'stable/boron' - jdk: 'openjdk8' - integration-test: boron - - beryllium: - next-release-tag: Beryllium-SR5 - branch: 'stable/beryllium' - jdk: 'openjdk7' - integration-test: beryllium + - carbon: + next-release-tag: Carbon + branch: 'master' + jdk: 'openjdk8' + integration-test: carbon + - boron: + next-release-tag: Boron-SR3 + branch: 'stable/boron' + jdk: 'openjdk8' + integration-test: boron + - beryllium: + next-release-tag: Beryllium-SR5 + branch: 'stable/beryllium' + jdk: 'openjdk7' + integration-test: beryllium project: 'releng/autorelease' archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch all-bundles.tar.gz' @@ -31,14 +32,14 @@ - project: name: autorelease-projects-guava21 jobs: - - 'autorelease-release-guava21-{stream}' + - 'autorelease-release-guava21-{stream}' stream: - - carbon: - next-release-tag: Guava21-Testing - branch: 'master' - jdk: 'openjdk8' - integration-test: carbon + - carbon: + next-release-tag: Guava21-Testing + branch: 'master' + jdk: 'openjdk8' + integration-test: carbon project: 'releng/autorelease' archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch all-bundles.tar.gz' @@ -51,161 +52,165 @@ jdk: '{jdk}' properties: - - opendaylight-infra-properties: - build-days-to-keep: '30' + - opendaylight-infra-properties: + build-days-to-keep: '30' parameters: - - maven-exec: - maven-version: 'mvn33' - - opendaylight-infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - autorelease-release-tag: - release-tag: '{next-release-tag}' - - autorelease-release-branch: - release-branch: '{branch}' + - maven-exec: + maven-version: 'mvn33' + - opendaylight-infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - autorelease-release-tag: + release-tag: '{next-release-tag}' + - autorelease-release-branch: + release-branch: '{branch}' scm: - - git: - credentials-id: 'opendaylight-jenkins-ssh' - url: '$GIT_BASE' - refspec: '$GERRIT_REFSPEC' - branches: - - '$GERRIT_BRANCH' - choosing-strategy: 'gerrit' - skip-tag: true - submodule: - recursive: true - timeout: 60 + - git: + credentials-id: 'opendaylight-jenkins-ssh' + url: '$GIT_BASE' + refspec: '$GERRIT_REFSPEC' + branches: + - '$GERRIT_BRANCH' + choosing-strategy: 'gerrit' + skip-tag: true + submodule: + recursive: true + timeout: 60 wrappers: - - opendaylight-infra-wrappers: - build-timeout: '1440' + - opendaylight-infra-wrappers: + build-timeout: '1440' triggers: - - gerrit: - server-name: '{server-name}' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'test-guava21-patches' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true + - gerrit: + server-name: '{server-name}' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'test-guava21-patches' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true builders: - - shell: | - #!/bin/bash - cd bgpcep - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/bgpcep - git review -d 50184 - cd .. - cd centinel - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/centinel - git review -d 50185 - cd .. - cd controller - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/controller - git review -d 50176 - cd .. - cd didm - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/didm - git review -d 50187 - cd .. - cd faas - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/faas - git review -d 50190 - cd .. - cd genius - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/genius - git review -d 50192 - cd .. - cd groupbasedpolicy - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/groupbasedpolicy - git review -d 50200 - cd .. - cd netvirt - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/netvirt - git review -d 50215 - cd .. - cd odlparent - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/odlparent - git review -d 49820 - cd .. - cd openflowplugin - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/openflowplugin - git review -d 50183 - cd .. - cd ovsdb - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/ovsdb - git review -d 50191 - cd .. - cd yangtools - git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/yangtools - git review -d 50173 - cd .. - # force jenkins install of maven version before any shell scripts use it - - maven-target: - maven-version: 'mvn33' - goals: '-version' - settings: 'autorelease-settings' - settings-type: cfp - global-settings: 'odl-global-settings' - global-settings-type: cfp - - wipe-local-maven-repo - - jacoco-nojava-workaround - - shell: "./scripts/list-project-dependencies.sh" - - autorelease-determine-merge-order - - autorelease-cfp: - autorelease-settings: 'autorelease-settings' - odl-global-settings: 'odl-global-settings' - - autorelease-generate-taglist - - autorelease-distribute-taglist - - autorelease-generate-release-patches - # In a perfect world projects should be releasing separately and we consume them - # via a project that pulls the release bits from each project from Nexus. - # Keep the patches compatible with that ideal, but apply an edit - # to enable building in a single maven reactor afterwards. - - autorelease-fix-relative-paths - - maven-target: - maven-version: 'mvn33' - pom: 'pom.xml' - goals: 'clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage' - java-opts: - - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - settings: 'autorelease-settings' - settings-type: cfp - global-settings: 'odl-global-settings' - global-settings-type: cfp - - autorelease-maven-deploy - - autorelease-get-integration-test-variables - - autorelease-maven-sources: - maven-version: 'mvn33' - settings: 'autorelease-settings' - global-settings: 'odl-global-settings' - - autorelease-maven-sources-post-process - - autorelease-sys-stats - - shell: | - mkdir -p archives/ - cp *.log *.prop $_ + - shell: | + #!/bin/bash + cd bgpcep + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/bgpcep + git review -d 50184 + cd .. + cd centinel + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/centinel + git review -d 50185 + cd .. + cd controller + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/controller + git review -d 50176 + cd .. + cd didm + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/didm + git review -d 50187 + cd .. + cd faas + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/faas + git review -d 50190 + cd .. + cd genius + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/genius + git review -d 50192 + cd .. + cd groupbasedpolicy + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/groupbasedpolicy + git review -d 50200 + cd .. + cd netvirt + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/netvirt + git review -d 50215 + cd .. + cd odlparent + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/odlparent + git review -d 49820 + cd .. + cd openflowplugin + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/openflowplugin + git review -d 50183 + cd .. + cd ovsdb + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/ovsdb + git review -d 50191 + cd .. + cd yangtools + git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/yangtools + git review -d 50173 + cd .. + # force jenkins install of maven version before any shell scripts use it + - maven-target: + maven-version: 'mvn33' + goals: '-version' + settings: 'autorelease-settings' + settings-type: cfp + global-settings: 'odl-global-settings' + global-settings-type: cfp + - wipe-local-maven-repo + - jacoco-nojava-workaround + - shell: "./scripts/list-project-dependencies.sh" + - autorelease-determine-merge-order + - autorelease-cfp: + autorelease-settings: 'autorelease-settings' + odl-global-settings: 'odl-global-settings' + - autorelease-generate-taglist + - autorelease-distribute-taglist + - autorelease-generate-release-patches + # In a perfect world projects should be releasing separately and we consume them + # via a project that pulls the release bits from each project from Nexus. + # Keep the patches compatible with that ideal, but apply an edit + # to enable building in a single maven reactor afterwards. + - autorelease-fix-relative-paths + - maven-target: + maven-version: 'mvn33' + pom: 'pom.xml' + goals: > + clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins + -Dcheckstyle.skip=true + -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r + -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage + java-opts: + - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + settings: 'autorelease-settings' + settings-type: cfp + global-settings: 'odl-global-settings' + global-settings-type: cfp + - autorelease-maven-deploy + - autorelease-get-integration-test-variables + - autorelease-maven-sources: + maven-version: 'mvn33' + settings: 'autorelease-settings' + global-settings: 'odl-global-settings' + - autorelease-maven-sources-post-process + - autorelease-sys-stats + - shell: | + mkdir -p archives/ + cp *.log *.prop $_ publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[autorelease]' - - trigger-parameterized-builds: - - project: 'integration-distribution-test-{integration-test}' - condition: UNSTABLE_OR_BETTER - property-file: variables.jenkins-trigger - fail-on-missing: true - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - email-notification: + email-recipients: '{email-recipients}' + email-prefix: '[autorelease]' + - trigger-parameterized-builds: + - project: 'integration-distribution-test-{integration-test}' + condition: UNSTABLE_OR_BETTER + property-file: variables.jenkins-trigger + fail-on-missing: true + - opendaylight-infra-shiplogs: + maven-version: 'mvn33' diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 5ac36ad7c3..1261ac9e5a 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -1,5 +1,5 @@ +--- # Autorelease build jobs - - job-template: name: 'autorelease-release-{stream}' @@ -8,112 +8,116 @@ jdk: '{jdk}' properties: - - opendaylight-infra-properties: - build-days-to-keep: '30' + - opendaylight-infra-properties: + build-days-to-keep: '30' parameters: - - maven-exec: - maven-version: 'mvn33' - - opendaylight-infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - autorelease-release-tag: - release-tag: '{next-release-tag}' - - autorelease-release-branch: - release-branch: '{branch}' + - maven-exec: + maven-version: 'mvn33' + - opendaylight-infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - autorelease-release-tag: + release-tag: '{next-release-tag}' + - autorelease-release-branch: + release-branch: '{branch}' scm: - - git: - credentials-id: 'opendaylight-jenkins-ssh' - url: '$GIT_BASE' - refspec: '$GERRIT_REFSPEC' - branches: - - '$GERRIT_BRANCH' - choosing-strategy: 'gerrit' - skip-tag: true - submodule: - recursive: true - timeout: 60 + - git: + credentials-id: 'opendaylight-jenkins-ssh' + url: '$GIT_BASE' + refspec: '$GERRIT_REFSPEC' + branches: + - '$GERRIT_BRANCH' + choosing-strategy: 'gerrit' + skip-tag: true + submodule: + recursive: true + timeout: 60 wrappers: - - opendaylight-infra-wrappers: - build-timeout: '1440' + - opendaylight-infra-wrappers: + build-timeout: '1440' triggers: - - timed: 'H 0 * * *' + - timed: 'H 0 * * *' builders: - # force jenkins install of maven version before any shell scripts use it - - maven-target: - maven-version: 'mvn33' - goals: '-version' - settings: 'autorelease-settings' - settings-type: cfp - global-settings: 'odl-global-settings' - global-settings-type: cfp - - wipe-local-maven-repo - - jacoco-nojava-workaround - - shell: "./scripts/list-project-dependencies.sh" - - autorelease-determine-merge-order - - autorelease-cfp: - autorelease-settings: 'autorelease-settings' - odl-global-settings: 'odl-global-settings' - - autorelease-generate-taglist - - autorelease-distribute-taglist - - distribute-build-url: - path: 'integration/distribution/distribution-karaf/src/main/assembly' - - autorelease-generate-release-patches - # In a perfect world projects should be releasing separately and we consume them - # via a project that pulls the release bits from each project from Nexus. - # Keep the patches compatible with that ideal, but apply an edit - # to enable building in a single maven reactor afterwards. - - autorelease-fix-relative-paths - - maven-target: - maven-version: 'mvn33' - pom: 'pom.xml' - goals: 'clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage' - java-opts: - - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - settings: 'autorelease-settings' - settings-type: cfp - global-settings: 'odl-global-settings' - global-settings-type: cfp - - autorelease-maven-deploy - - autorelease-get-integration-test-variables - - autorelease-maven-sources: - maven-version: 'mvn33' - settings: 'autorelease-settings' - global-settings: 'odl-global-settings' - - autorelease-maven-sources-post-process - - autorelease-sys-stats - - shell: | - mkdir -p archives/ - cp *.log *.prop $_ + # force jenkins install of maven version before any shell scripts use it + - maven-target: + maven-version: 'mvn33' + goals: '-version' + settings: 'autorelease-settings' + settings-type: cfp + global-settings: 'odl-global-settings' + global-settings-type: cfp + - wipe-local-maven-repo + - jacoco-nojava-workaround + - shell: "./scripts/list-project-dependencies.sh" + - autorelease-determine-merge-order + - autorelease-cfp: + autorelease-settings: 'autorelease-settings' + odl-global-settings: 'odl-global-settings' + - autorelease-generate-taglist + - autorelease-distribute-taglist + - distribute-build-url: + path: 'integration/distribution/distribution-karaf/src/main/assembly' + - autorelease-generate-release-patches + # In a perfect world projects should be releasing separately and we consume them + # via a project that pulls the release bits from each project from Nexus. + # Keep the patches compatible with that ideal, but apply an edit + # to enable building in a single maven reactor afterwards. + - autorelease-fix-relative-paths + - maven-target: + maven-version: 'mvn33' + pom: 'pom.xml' + goals: > + clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins + -Dcheckstyle.skip=true + -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r + -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage + java-opts: + - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + settings: 'autorelease-settings' + settings-type: cfp + global-settings: 'odl-global-settings' + global-settings-type: cfp + - autorelease-maven-deploy + - autorelease-get-integration-test-variables + - autorelease-maven-sources: + maven-version: 'mvn33' + settings: 'autorelease-settings' + global-settings: 'odl-global-settings' + - autorelease-maven-sources-post-process + - autorelease-sys-stats + - shell: | + mkdir -p archives/ + cp *.log *.prop $_ publishers: - - opendaylight-infra-notify-status - - archive: - # Need to archive dependencies.log in Jenkins to provide a simple - # way for downstream jobs to pull the latest version of this file - # in their builds. - artifacts: 'dependencies.log' - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[autorelease]' - - trigger-parameterized-builds: - - project: 'integration-distribution-test-{integration-test}' - condition: UNSTABLE_OR_BETTER - property-file: variables.jenkins-trigger - fail-on-missing: true - - project: 'packaging-build-rpm-master' - condition: UNSTABLE_OR_BETTER - predefined-parameters: DOWNLOAD_URL=$BUNDLEURL - property-file: variables.jenkins-trigger - fail-on-missing: true - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - opendaylight-infra-notify-status + - archive: + # Need to archive dependencies.log in Jenkins to provide a simple + # way for downstream jobs to pull the latest version of this file + # in their builds. + artifacts: 'dependencies.log' + - email-notification: + email-recipients: '{email-recipients}' + email-prefix: '[autorelease]' + - trigger-parameterized-builds: + - project: 'integration-distribution-test-{integration-test}' + condition: UNSTABLE_OR_BETTER + property-file: variables.jenkins-trigger + fail-on-missing: true + - project: 'packaging-build-rpm-master' + condition: UNSTABLE_OR_BETTER + predefined-parameters: DOWNLOAD_URL=$BUNDLEURL + property-file: variables.jenkins-trigger + fail-on-missing: true + - opendaylight-infra-shiplogs: + maven-version: 'mvn33' - job-template: @@ -123,60 +127,60 @@ node: centos7-java-builder-2c-8g properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + - opendaylight-infra-properties: + build-days-to-keep: '{build-days-to-keep}' parameters: - - opendaylight-infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - string: - name: REPORT_DIR - default: '$WORKSPACE/project-reports' - description: "The directory containing project reports" + - opendaylight-infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - string: + name: REPORT_DIR + default: '$WORKSPACE/project-reports' + description: "The directory containing project reports" scm: - - git: - credentials-id: 'opendaylight-jenkins-ssh' - url: '$GIT_BASE' - refspec: '$GERRIT_REFSPEC' - branches: - - '$GERRIT_BRANCH' - choosing-strategy: 'gerrit' - skip-tag: true - submodule: - recursive: true + - git: + credentials-id: 'opendaylight-jenkins-ssh' + url: '$GIT_BASE' + refspec: '$GERRIT_REFSPEC' + branches: + - '$GERRIT_BRANCH' + choosing-strategy: 'gerrit' + skip-tag: true + submodule: + recursive: true wrappers: - - opendaylight-infra-wrappers: - build-timeout: '30' + - opendaylight-infra-wrappers: + build-timeout: '30' triggers: - - timed: '0 0 * * 0' + - timed: '0 0 * * 0' builders: - - shell: 'echo "DATE=`date +%Y-%m-%d`" > $WORKSPACE/variables.prop' - - inject: - properties-file: variables.prop - - autorelease-generate-project-report - - shell: "./scripts/list-project-dependencies.sh" - - autorelease-determine-merge-order - - autorelease-sys-stats + - shell: 'echo "DATE=`date +%Y-%m-%d`" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - autorelease-generate-project-report + - shell: "./scripts/list-project-dependencies.sh" + - autorelease-determine-merge-order + - autorelease-sys-stats publishers: - - email-ext: - attachments: 'project-reports/*.log' - recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org' - reply-to: dev@lists.opendaylight.org - content-type: default - subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}' - body: | - This is a project report generated on $DATE listing the commit - history of ODL projects for the past week. See attached - git-report.log - Archive also available on Jenkins at $BUILD_URL - always: true - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - email-ext: + attachments: 'project-reports/*.log' + recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org' + reply-to: dev@lists.opendaylight.org + content-type: default + subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}' + body: | + This is a project report generated on $DATE listing the commit + history of ODL projects for the past week. See attached + git-report.log + Archive also available on Jenkins at $BUILD_URL + always: true + - opendaylight-infra-shiplogs: + maven-version: 'mvn33' diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 7761c8683d..7093d2c978 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -1,12 +1,13 @@ +--- - project: name: autorelease-version-management jobs: - - '{project-name}-verify-python-{stream}' + - '{project-name}-verify-python-{stream}' project: releng/autorelease project-name: autorelease-version-management toxdir: 'scripts/version_management' stream: - - boron: - branch: master + - boron: + branch: master -- 2.36.6