diff options
| -rw-r--r-- | jjb/ci-management/ci-management.yaml | 16 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 84 | ||||
| -rw-r--r-- | jjb/global-templates-python.yaml | 14 | ||||
| -rw-r--r-- | jjb/global-templates-script.yaml | 57 |
4 files changed, 127 insertions, 44 deletions
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 91809d9a1..27122dad5 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -75,8 +75,9 @@ gzip archives/job_output/* - ci-management-check-unicode -# publishers: -# - infra-shiplogs + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: name: '{project}-merge-jjb' @@ -164,9 +165,9 @@ builders: - packer-validate -# publishers: -# - infra-shiplogs - + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: name: '{project}-merge-packer-{platforms}-{templates}' project-type: freestyle @@ -206,5 +207,6 @@ platform: '{platforms}' template: '{templates}' -# publishers: -# - infra-shiplogs + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 217cb7ab1..69f422f61 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -57,9 +57,9 @@ maven-opts: - maven.test.skip=true -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: @@ -118,9 +118,9 @@ global-settings: 'global-settings' global-settings-type: cfp -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for Java verify jobs with POM not at the root @@ -182,9 +182,9 @@ global-settings: 'global-settings' global-settings-type: cfp -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for Java daily release jobs @@ -244,6 +244,10 @@ global-settings: 'global-settings' global-settings-type: cfp + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: # Job template for Java daily release jobs # @@ -314,6 +318,10 @@ global-settings: 'global-settings' global-settings-type: cfp + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: # Job template for Java daily release jobs with POM not at the root # @@ -376,6 +384,10 @@ global-settings: 'global-settings' global-settings-type: cfp + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: # Job template for Java merge jobs # @@ -432,9 +444,9 @@ global-settings: 'global-settings' global-settings-type: cfp -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for Java merge jobs that should also be triggered by upstream @@ -496,9 +508,9 @@ global-settings: 'global-settings' global-settings-type: cfp -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for Java merge jobs with POM not at the root @@ -561,9 +573,9 @@ global-settings: 'global-settings' global-settings-type: cfp -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: name: '{project-name}-{stream}-docker-java-daily' @@ -615,6 +627,10 @@ # use default as mvn-profile if profile is not needed mvn-profile: '{mvn-profile}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: name: '{project-name}-{stream}-docker-java-shell-daily' project-type: freestyle @@ -668,6 +684,10 @@ - shell: '{script}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: name: '{project-name}-{stream}-docker-java-version-shell-daily' project-type: freestyle @@ -734,6 +754,10 @@ - shell: '{script}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: name: '{project-name}-{stream}-docker-version-java-daily' project-type: freestyle @@ -797,6 +821,10 @@ # use default as mvn-profile if profile is not needed mvn-profile: '{mvn-profile}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: name: '{project-name}-{stream}-aai-docker-java-daily' project-type: freestyle @@ -864,6 +892,10 @@ - shell: !include-raw-escape: include-docker-push.sh + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: # Job template for Java daily release jobs # @@ -935,6 +967,10 @@ global-settings: 'global-settings' global-settings-type: cfp + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: # Job template for Java daily release jobs # @@ -1012,6 +1048,10 @@ global-settings: 'global-settings' global-settings-type: cfp + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: # Template for maven site plugin invocation # @@ -1079,6 +1119,10 @@ global-settings: 'global-settings' global-settings-type: cfp + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: # Job template for Java merge jobs # @@ -1134,3 +1178,7 @@ pom: '{docker-pom}' # use default as mvn-profile if profile is not needed mvn-profile: '{mvn-profile}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index 248d4561f..63f6131f8 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -63,9 +63,9 @@ cd $WORKSPACE/{path} tox -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: name: '{project-name}-{stream}-docker-shell-daily' @@ -117,6 +117,10 @@ docker tag openecomp/testsuite:latest $REPO/openecomp/testsuite:1.0-STAGING-latest docker push $REPO/openecomp/testsuite:1.0-STAGING-latest + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: name: '{project-name}-{stream}-2scm-docker-shell-daily' project-type: freestyle @@ -182,3 +186,7 @@ docker tag openecomp/testsuite:latest $REPO/openecomp/testsuite:$tag docker push $REPO/openecomp/testsuite:$tag done + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index 42cf98d49..6e19c81bb 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -62,6 +62,9 @@ - docker-login - shell: '{script}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for merging a submission. triggered on @@ -121,6 +124,9 @@ - docker-login - shell: '{script}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for daily-release a submission. triggered on timer, does @@ -198,6 +204,10 @@ - docker-login - shell: '{script}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + - job-template: # Job template for daily-release a submission. triggered on timer, does # scm mvn with passed-in goals, then run script. @@ -266,7 +276,9 @@ - docker-login - shell: '{script}' - + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for verifying a submission. triggered on @@ -340,6 +352,9 @@ - docker-login - shell: '{script}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for merged submission. triggered on @@ -413,6 +428,9 @@ - docker-login - shell: '{script}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for merged submission. triggered on @@ -499,6 +517,9 @@ - docker-login - shell: '{script}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for basic scm and script trigger @@ -557,9 +578,9 @@ global-settings-type: cfp - shell: '{script}' -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for 2 scm and script trigger @@ -630,9 +651,9 @@ global-settings-type: cfp - shell: '{script}' -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: @@ -714,9 +735,9 @@ global-settings-type: cfp - shell: '{script}' -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' # vim: sw=2 ts=2 sts=2 et : @@ -788,9 +809,9 @@ global-settings-type: cfp - shell: '{script}' -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # Job template for scm and script trigger - for docker daily release @@ -859,9 +880,9 @@ global-settings-type: cfp - shell: '{script}' -# publishers: -# - infra-shiplogs: -# maven-version: '{maven-version}' + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' - job-template: # 1. PULL the desired image @@ -905,3 +926,7 @@ settings-file: '{mvn-settings}' - docker-login - shell: !include-raw: include-docker-blessing.sh + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' |