From 2bf22a0059714f8fdf36a8bed798ede700873c80 Mon Sep 17 00:00:00 2001 From: Venkata Harish K Kajur Date: Mon, 15 May 2017 16:22:55 -0400 Subject: Add the common resources and resources jobs Also update the docker push script to not push for the new repos This part of the push should be automated by the maven build Keeping the docker push for any other components that might use it Change-Id: Ib2da0ce491eb99c96257a4503cb3f89f502795c4 Signed-off-by: Venkata Harish K Kajur --- jjb/aai/aai-aai-common.yaml | 23 ++++++++++++++ jjb/aai/aai-resources.yaml | 24 +++++++++++++++ jjb/aai/aai-traversal.yaml | 24 +++++++++++++++ jjb/global-templates-java.yaml | 70 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+) create mode 100644 jjb/aai/aai-aai-common.yaml create mode 100644 jjb/aai/aai-resources.yaml create mode 100644 jjb/aai/aai-traversal.yaml diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml new file mode 100644 index 000000000..1b07db757 --- /dev/null +++ b/jjb/aai/aai-aai-common.yaml @@ -0,0 +1,23 @@ +--- +- project: + name: aai-aai-common + project-name: 'aai-aai-common' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-docker-image-blessing' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + + project: 'aai/aai-common' + stream: + - 'master': + branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' + mvn-settings: 'aai-aai-common-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml new file mode 100644 index 000000000..c0517716f --- /dev/null +++ b/jjb/aai/aai-resources.yaml @@ -0,0 +1,24 @@ +--- +- project: + name: aai-resources + project-name: 'aai-resources' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-docker-image-blessing' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-aai-docker-java-version-daily': + pom: 'aai-resources/pom.xml' + mvn-goals: 'docker:build docker:push' + + project: 'aai/aai-resources' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-resources-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml new file mode 100644 index 000000000..146ddbdc8 --- /dev/null +++ b/jjb/aai/aai-traversal.yaml @@ -0,0 +1,24 @@ +--- +- project: + name: aai-traversal + project-name: 'aai-traversal' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-docker-image-blessing' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-aai-docker-java-version-daily': + pom: 'aai-traversal/pom.xml' + mvn-goals: 'docker:build docker:push' + + project: 'aai/traversal' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-traversal-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 10f319a29..66013dee6 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1307,3 +1307,73 @@ publishers: - infra-shiplogs: maven-version: '{maven-version}' + +- job-template: + name: '{project-name}-{stream}-aai-docker-java-version-daily' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - maven-exec: + maven-version: '{maven-version}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + # 12 AM UTC + - timed: 'H 12 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - docker-login + + - maven-target: + maven-version: '{maven-version}' + pom: 'pom.xml' + goals: 'clean install -DskipTests -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: '{mvn-goals}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + properties: + - maven.test.skip=true + - docker.pull.registry=nexus3.onap.org:10001 + - docker.push.registry=nexus3.onap.org:10003 + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + -- cgit 1.2.3-korg