diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/aai/aai-aai-service.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcae/dcae-demo.yaml | 34 | ||||
| -rw-r--r-- | jjb/dcae/pgaas.yaml | 20 | ||||
| -rw-r--r-- | jjb/global-templates-script.yaml | 89 |
4 files changed, 85 insertions, 60 deletions
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml index b9ec78628..e4ca295a7 100644 --- a/jjb/aai/aai-aai-service.yaml +++ b/jjb/aai/aai-aai-service.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'pom.xml' + docker-pom: 'ajsc-aai/pom.xml' mvn-profile: 'docker' project: 'aai/aai-service' diff --git a/jjb/dcae/dcae-demo.yaml b/jjb/dcae/dcae-demo.yaml new file mode 100644 index 000000000..066ca324d --- /dev/null +++ b/jjb/dcae/dcae-demo.yaml @@ -0,0 +1,34 @@ +--- + +- project: + name: dcae-demo + project-name: 'dcae-demo' + stream: 'master' + project: 'dcae/demo' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcae-demo-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + mvn-goals: '--version' + mvn-goals-versioning: '--version' + jobs: + - '{project-name}-{stream}-daily-release-scm-mvn-script': + mvn-goals: 'clean deploy' + maven-deploy-properties: | + deployAtEnd=true + script: | + bash dcae-demo-controller/src/main/docker-build/build.sh + bash dcae-demo-controller/src/main/docker-build/push.sh nexus3.openecomp.org:10003 + - '{project-name}-{stream}-merge-scm-mvn-script': + mvn-goals: 'clean deploy' + script: | + bash dcae-demo-controller/src/main/docker-build/build.sh + bash dcae-demo-controller/src/main/docker-build/push.sh nexus3.openecomp.org:10003 + - '{project-name}-{stream}-verify-scm-mvn-script': + mvn-goals: 'clean install' + script: | + bash dcae-demo-controller/src/main/docker-build/build.sh + diff --git a/jjb/dcae/pgaas.yaml b/jjb/dcae/pgaas.yaml index 78643a82a..7be82ed35 100644 --- a/jjb/dcae/pgaas.yaml +++ b/jjb/dcae/pgaas.yaml @@ -3,7 +3,6 @@ - project: name: dcae-pgaas project-name: 'dcae-pgaas' - stream: 'master' project: 'dcae/pgaas' stream: - 'master': @@ -11,19 +10,22 @@ mvn-settings: 'dcae-pgaas-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-docker-8c-8g mvn-goals: '--version' mvn-goals-versioning: '--version' + extra-project: 'dcae/utils/buildtools' + extra-refspec: 'refs/heads/{branch}' + extra-branch: 'master' + checkout-dir: 'buildtools' jobs: - - '{project-name}-{stream}-daily-release-scm-mvn-script': + - '{project-name}-{stream}-daily-release-2scm-mvn-script': maven-deploy-properties: | deployAtEnd=true script: - !include-raw-escape: 'script-pgaas-daily-release.sh' - - '{project-name}-{stream}-merge-scm-mvn-script': + !include-raw-escape: 'script-pgaas-daily-release.sh' + - '{project-name}-{stream}-merge-2scm-mvn-script': script: - !include-raw-escape: 'script-pgaas-merge.sh' - - '{project-name}-{stream}-verify-scm-mvn-script': + !include-raw-escape: 'script-pgaas-merge.sh' + - '{project-name}-{stream}-verify-2scm-mvn-script': script: - !include-raw-escape: 'script-pgaas-verify.sh' - + !include-raw-escape: 'script-pgaas-verify.sh' diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index dbe7850f4..3f1f20047 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -3,21 +3,21 @@ - job-template: - # Job template for verify a submission. triggered on gerrit-trigger-patch-submitted, does - # scm, mvn with passed in goals, then run script + # Job template for verifying a submission. triggered on + # gerrit-trigger-patch-submitted, does scm, mvn with passed in goals, + # then run script # # Required Variables: # branch: git branch - # build-node: what build node to run on # script: build script to execute # mvn-settings: settings file for this specific job - # mvn-goals: space separated list of maven build goals (e.g. clean, install - # etc, --version for noop) + # mvn-goals: space separated list of maven build goals (e.g. + # clean, install etc, --version for noop) name: '{project-name}-{stream}-verify-scm-mvn-script' project-type: freestyle concurrent: true - node: '{build-node}' + node: 'ubuntu1604-docker-8c-8g' properties: - ecomp-infra-properties: @@ -61,22 +61,20 @@ - shell: '{script}' - - job-template: - # Job template for merging a submission. triggered on gerrit-trigger-patch-merged, does - # scm, mvn with passed-in goals, then run script - # + # Job template for merging a submission. triggered on + # gerrit-trigger-patch-merged, does scm, mvn with passed-in goals, then + # run script # Required Variables: # branch: git branch - # build-node: what build node to run on # script: build script to execute # mvn-settings: settings file for this specific job - # mvn-goals: space separated list of maven build goals (--version for noop, - # clean deploy for deploy [version must be snapshot]) + # mvn-goals: space separated list of maven build goals (--version + # for noop, clean deploy for deploy [snapshot]) name: '{project-name}-{stream}-merge-scm-mvn-script' project-type: freestyle - node: '{build-node}' + node: 'ubuntu1604-docker-8c-8g' properties: - ecomp-infra-properties: @@ -120,24 +118,23 @@ - shell: '{script}' - - - job-template: - # Job template for daily-release a submission. triggered on timer, does scm, - # mvn with passed-in goals, then run script + # Job template for daily-release a submission. triggered on timer, does + # scm mvn with passed-in goals, then run script # # Required Variables: # branch: git branch - # build-node: what build node to run on # script: build script to execute - # mvn-goals-versioning: space separated list of maven build goals (--version for no op, - # or versions:set versions:update-child-modules versions:commit or --version) - # mvn-goals: space separated list of maven build goals (--version for noop, or clean deploy) + # mvn-goals-versioning: space separated list of maven build goals + # (--version for no op, + # or versions:set versions:update-child-modules versions:commit) + # mvn-goals: space separated list of maven build goals (--version for + # noop, or clean deploy) name: '{project-name}-{stream}-daily-release-scm-mvn-script' project-type: freestyle concurrent: true - node: '{build-node}' + node: 'ubuntu1604-docker-8c-8g' properties: - ecomp-infra-properties: @@ -192,15 +189,13 @@ - shell: '{script}' - - - job-template: - # Job template for verifying a submission. triggered on gerrit-trigger-patch-submitted, + # Job template for verifying a submission. triggered on + # gerrit-trigger-patch-submitted, # does scm 2 repos, mvn with passed-in goals, then run script # # Required Variables: # branch: git branch - # build-node: what build node to run on # script: build script to execute # extra-project: extra gerrit project to checkout # extra-refspec: refspec for the extra project @@ -209,14 +204,14 @@ # DO NOT SET THIS TO anything that translates to # $WORKSPACE as it will destroy the initial # project checkout - # mvn-goals: space separated list of maven build goals (e.g. clean, install etc, - # --version for noop) + # mvn-goals: space separated list of maven build goals (e.g. + # clean, install etc, --version for noop) name: '{project-name}-{stream}-verify-2scm-mvn-script' project-type: freestyle concurrent: true - node: '{build-node}' + node: 'ubuntu1604-docker-8c-8g' properties: - ecomp-infra-properties: @@ -265,14 +260,13 @@ - shell: '{script}' - - job-template: - # Job template for merged submission. triggered on gerrit-trigger-patch-merged, - # does scm of 2 repos, mvn with passed in goals, then run script + # Job template for merged submission. triggered on + # gerrit-trigger-patch-merged,does scm of 2 repos, mvn with passed in + # goals, then run script # # Required Variables: # branch: git branch - # build-node: what build node to run on # script: build script to execute # extra-project: extra gerrit project to checkout # extra-refspec: refspec for the extra project @@ -281,14 +275,14 @@ # DO NOT SET THIS TO anything that translates to # $WORKSPACE as it will destroy the initial # project checkout - # mvn-goals: space separated list of maven build goals (--version for no op, - # clean deploy for mvn project) + # mvn-goals: space separated list of maven build goals (--version + # for noop, clean deploy for mvn project) name: '{project-name}-{stream}-merge-2scm-mvn-script' project-type: freestyle concurrent: true - node: '{build-node}' + node: 'ubuntu1604-docker-8c-8g' properties: - ecomp-infra-properties: @@ -337,14 +331,13 @@ - shell: '{script}' - - job-template: - # Job template for merged submission. triggered on gerrit-trigger-patch-merged, - # does scm x2, mvn with passed-in goals, then run script + # Job template for merged submission. triggered on + # gerrit-trigger-patch-merged, does scm x2, mvn with passed-in goals, + # then run script # # Required Variables: # branch: git branch - # build-node: what build node to run on # script: build script to execute # extra-project: extra gerrit project to checkout # extra-refspec: refspec for the extra project @@ -353,16 +346,15 @@ # DO NOT SET THIS TO anything that translates to # $WORKSPACE as it will destroy the initial # project checkout - # mvn-goals: space separated list of maven build goals (--version for no op, - # clean deploy for mvn project) - # mvn-goals-versioning: space separated list of maven build goals (--version for no op, - # clean deploy for mvn project) + # mvn-goals: space separated list of maven build goals (--version + # for noop, clean deploy for mvn project) + # mvn-goals-versioning: space separated list of maven build goals + # (--version for no op, clean deploy for mvn project) name: '{project-name}-{stream}-daily-release-2scm-mvn-script' project-type: freestyle - concurrent: true - node: '{build-node}' + node: 'ubuntu1604-docker-8c-8g' properties: - ecomp-infra-properties: @@ -419,9 +411,6 @@ - shell: '{script}' - - - - job-template: # Job template for basic scm and script trigger # |