From 6978be926a189aed868564df037e0193e468ce06 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 29 Mar 2016 12:08:36 -0400 Subject: [PATCH] Revert "Add autorelease test jobs to troubleshoot" This job was created to help troubleshoot but we no longer need it. This reverts commit d62e8ff9aa00e85e1292af647a65e371d2ff7696. Change-Id: I038872d69a64453863317822a0b086f2468d7d4b Signed-off-by: Thanh Ha --- jjb/autorelease/autorelease-macros.yaml | 2 +- jjb/autorelease/autorelease-projects.yaml | 1 - jjb/autorelease/autorelease-templates.yaml | 108 --------------------- 3 files changed, 1 insertion(+), 110 deletions(-) diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index a8a0a9f16e..da183a1012 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -111,7 +111,7 @@ - maven-target: maven-version: '{maven-version}' pom: 'pom.xml' - goals: 'dependency:sources -Poffset0,offset1,offset2,offset3 -DoutputFile=$WORKSPACE/sources.log -DappendOutput -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' + goals: '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}' diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 83c8c63af3..233219097a 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -2,7 +2,6 @@ name: autorelease-projects jobs: - 'autorelease-release-{stream}' - - 'autorelease-release-test-{stream}' - 'autorelease-project-report-{stream}' - 'autorelease-site-publish-{stream}' - 'autorelease-site-verify-{stream}' diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index adfd78183a..2aa6c68dca 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -84,114 +84,6 @@ property-file: variables.prop fail-on-missing: true -- job-template: - name: 'autorelease-release-test-{stream}' - - project-type: maven - node: dynamic_autorelease - jdk: '{jdk}' - - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - - parameters: - - project-parameter: - project: '{project}' - - autorelease-release-tag: - release-tag: '{stream}-daily' - - autorelease-release-branch: - release-branch: '{branch}' - - autorelease-release-datestamp: - datestamp: true - - scm: - - git: - credentials-id: '{ssh-credentials}' - url: '$GIT_BASE' - refspec: '' - branches: - - 'origin/{branch}' - skip-tag: true - submodule: - recursive: true - - wrappers: - - autorelease-build-timeout - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - - # triggers: - # - timed: 'H 0 * * *' - - prebuilders: - - wipe-org-opendaylight-repo - - jacoco-nojava-workaround - - autorelease-cfp: - autorelease-settings: '{autorelease-settings}' - odl-global-settings: '{odl-global-settings}' - - autorelease-generate-taglist - - autorelease-generate-release-patches - - maven: - maven-name: '{mvn33}' - root-pom: 'pom.xml' - goals: 'clean deploy -Pintegrationtests,docs,repoBuild,offset0 -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' - maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - settings: '{autorelease-settings}' - global-settings: '{odl-global-settings}' - automatic-archiving: true - post-step-run-condition: UNSTABLE - - postbuilders: - - maven-target: - maven-version: '{mvn33}' - pom: 'pom.xml' - goals: 'clean deploy -Pintegrationtests,docs,repoBuild,offset1 -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: - - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - settings: '{autorelease-settings}' - global-settings: '{odl-global-settings}' - - maven-target: - maven-version: '{mvn33}' - pom: 'pom.xml' - goals: 'clean deploy -Pintegrationtests,docs,repoBuild,offset2 -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: - - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - settings: '{autorelease-settings}' - global-settings: '{odl-global-settings}' - - maven-target: - maven-version: '{mvn33}' - pom: 'pom.xml' - goals: 'clean deploy -Pintegrationtests,docs,repoBuild,offset3 -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: - - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - settings: '{autorelease-settings}' - global-settings: '{odl-global-settings}' - - autorelease-maven-deploy - - shell: "./scripts/list-project-dependencies.sh" - - 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 - - publishers: - - archive-artifacts: - artifacts: '*.prop,*.log,patches/*.patch,patches/*.log' - - email-notification: - email-prefix: '[autorelease]' - # - trigger-parameterized-builds: - # - project: 'integration-distribution-test-{integration-test}' - # condition: UNSTABLE_OR_BETTER - # property-file: variables.prop - # fail-on-missing: true - - job-template: name: 'autorelease-project-report-{stream}' -- 2.36.6