diff options
| -rw-r--r-- | jjb/global-macros.yaml | 18 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 76 | ||||
| -rw-r--r-- | jjb/portal/docker-build-deploy.sh | 4 | ||||
| -rw-r--r-- | jjb/portal/portal-docker.yaml | 26 | ||||
| -rw-r--r-- | jjb/vid/vid.yaml | 2 |
5 files changed, 124 insertions, 2 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index f7e147297..460bb3ad4 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -311,6 +311,24 @@ - compare-type: 'ANT' pattern: '{files}' +- trigger: + name: gerrit-trigger-release-manually + triggers: + - gerrit: + server-name: '{server}' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'please release' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: 'ANT' + pattern: '**' + # WRAPPERS - wrapper: name: build-timeout diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index f080a4854..b88567f1d 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -216,6 +216,10 @@ triggers: # 11 AM UTC - timed: 'H 11 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' builders: - provide-maven-settings: @@ -283,6 +287,10 @@ triggers: # 11 AM UTC - timed: 'H 11 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' builders: - provide-maven-settings: @@ -358,6 +366,68 @@ # maven-version: 'mvn33' - job-template: + # Job template for Java merge jobs that should also be triggered by upstream + # merges + # + # Required Variables: + # stream: release stream + # branch: git branch + # dependencies: fully qualified upstream job name to trigger on + # this may be '' + name: '{project-name}-{stream}-downstream-merge-java' + + project-type: freestyle + node: '{build-node}' + + properties: + - ecomp-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - ecomp-infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + + wrappers: + - ecomp-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - reverse: + jobs: '{dependencies}' + result: 'success' + - gerrit-trigger-patch-merged: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + - maven-target: + maven-version: 'mvn33' + # yamllint disable rule:line-length + goals: 'clean deploy' + # yamllint enable + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + +# publishers: +# - ecomp-infra-shiplogs: +# maven-version: 'mvn33' + +- job-template: # Job template for Java merge jobs with POM not at the root # # The purpose of this job template is to run "maven clean deploy" for @@ -446,8 +516,12 @@ build-timeout: '{build-timeout}' triggers: - # 11 AM UTC + # 12 AM UTC - timed: 'H 12 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' builders: diff --git a/jjb/portal/docker-build-deploy.sh b/jjb/portal/docker-build-deploy.sh new file mode 100644 index 000000000..a9b67e708 --- /dev/null +++ b/jjb/portal/docker-build-deploy.sh @@ -0,0 +1,4 @@ + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR +ls -ltr
\ No newline at end of file diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml new file mode 100644 index 000000000..7cf612f2d --- /dev/null +++ b/jjb/portal/portal-docker.yaml @@ -0,0 +1,26 @@ +--- + +- project: + name: portal-docker + project-name: 'portal-docker' + jobs: + - '{project-name}-{stream}-three-scm-verify-script' + + project: 'portal' + stream: + - 'master': + branch: 'master' + mvn-settings: 'portal-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g + extra-project1: 'ecompsdkos' + extra-branch1: 'master' + extra-refspec1: 'refs/heads/{branch}' + checkout-dir1: 'ecompsdkos' + extra-project2: 'ui/dmaapbc' + extra-branch2: 'master' + extra-refspec2: 'refs/heads/{branch}' + checkout-dir2: 'dmaapbc' + script: + !include-raw-escape: 'docker-build-deploy.sh' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index d7cc29a54..c0936fac6 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'deliveries/pom.xml' + docker-pom: 'pom.xml' mvn-profile: 'default' project: 'vid' |