X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-templates.yaml;h=f4791ba5c6879454a1fcd9bca6f561e1316fc4bd;hb=bacdb8e9b58cc4738e84e29cf265a5242e8021ed;hp=8bc61f681ddc98e71f53a2eaa7f582d370c9a1e4;hpb=53241bd817068fec19782bf46448301ece5edb90;p=releng%2Fbuilder.git diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml index 8bc61f681..f4791ba5c 100644 --- a/jjb/integration/distribution/distribution-templates.yaml +++ b/jjb/integration/distribution/distribution-templates.yaml @@ -24,7 +24,7 @@ project: '{project}' branch: '{branch}' refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt' + artifacts: '{archive-artifacts}' - integration-distribution-git-url: git-url: '{git-url}' - distribution-karaf-version: @@ -61,120 +61,31 @@ - distribution-check-build-project: pom: '$GERRIT_PROJECT/pom.xml' mvn-opts: '{opendaylight-infra-mvn-opts}' + # TODO: {opendaylight-infra-parallel-mvn-opts}? - distribution-check-verify-groupid: gerrit-project: '$GERRIT_PROJECT' - distribution-check-download-deps: dist-pom: 'distribution/pom.xml' - mvn-opts: '{opendaylight-infra-mvn-opts}' + mvn-opts: '{opendaylight-infra-parallel-mvn-opts}' - distribution-check-delete-snapshots - distribution-check-configure-remotes - - distribution-check-repeat-build: - dist-pom: 'distribution/pom.xml' - mvn-opts: '{opendaylight-infra-mvn-opts}' - - integration-upload-distribution: - dist-pom: distribution/pom.xml - - integration-distribution-check - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[{project-name}]' - - postbuildscript: - builders: - - shell: | - #!/bin/bash - mkdir -p $WORKSPACE/archives - cp karaf*.log $WORKSPACE/archives - script-only-if-succeeded: false - script-only-if-failed: false - mark-unstable-if-failed: true - - lf-infra-publish - -# Delete these when Karaf 4 becomes Nitrogen default. - -# TODO: Is there a way to de-duplicate with generic template parts? - -- job-template: - name: '{project-name}-distribution3-check-nitrogen' - disabled: false - - project-type: freestyle - node: '{build-node}' - concurrent: true - jdk: '{jdk}' - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: 'master' - refspec: 'refs/heads/master' - artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt' - - integration-distribution-git-url: - git-url: '{git-url}' - - distribution-karaf-version: - karaf-version: karaf3 - - maven-exec: - maven-version: mvn33 - - scm: - - integration-gerrit-scm: - basedir: '$GERRIT_PROJECT' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - - integration-distribution-scm: - branch: 'master' - - wrappers: - - opendaylight-infra-wrappers: - # Distro-check jobs typically run within 10 - 30 minutes - # with 45 minutes being the occassional edge case. - # enforce a 60 minute limit to ensure stuck jobs get - # cleared up sooner. - # Double that as Karaf 3+4 may take longer. - build-timeout: '120' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: '{project}' - branch: 'master' - files: '**' - - builders: - - distribution-check-wipe - - distribution-check-build-project: + - distribution-check-repeat-project-build: pom: '$GERRIT_PROJECT/pom.xml' mvn-opts: '{opendaylight-infra-mvn-opts}' - - distribution-check-verify-groupid: - gerrit-project: '$GERRIT_PROJECT' - - distribution-check-download-deps: - dist-pom: 'distribution/pom.xml' - mvn-opts: '{opendaylight-infra-mvn-opts}' - - distribution-check-delete-snapshots - - distribution-check-configure-remotes - - distribution-check-repeat-build: + # TODO: {opendaylight-infra-parallel-mvn-opts}? + - distribution-check-repeat-distro-build: dist-pom: 'distribution/pom.xml' - mvn-opts: '{opendaylight-infra-mvn-opts}' + mvn-opts: '{opendaylight-infra-parallel-mvn-opts}' + - integration-set-variables + - distribution-check-warn-9191 + - distribution-check-warn-9192 - integration-upload-distribution: dist-pom: distribution/pom.xml - - integration-distribution-check + - distribution-check-bootup publishers: - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project-name}]' - - postbuildscript: - builders: - - shell: | - #!/bin/bash - mkdir -p $WORKSPACE/archives - cp karaf*.log $WORKSPACE/archives - script-only-if-succeeded: false - script-only-if-failed: false - mark-unstable-if-failed: true + - integration-csit-archive-build - lf-infra-publish