diff options
author | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-10-22 17:32:33 -0700 |
---|---|---|
committer | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-10-22 17:32:33 -0700 |
commit | 05ae7da419712f45f60dd40ed1ec180b3935a989 (patch) | |
tree | addba84b090a512f0c3ca3af6586243023c89ab9 /jjb | |
parent | 8347dc8797721948bae806eec936ef24137a512e (diff) |
Fix global-templates unstable jobs
Add lf-infra-pre-build build step in local
global-templates to successfully
install lftools and avoid unstable jobs.
Change-Id: I1a41e121b810371c1be987aaafec3c4b0aaa5e89
Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/global-templates-c.yaml | 2 | ||||
-rw-r--r-- | jjb/global-templates-docker.yaml | 14 | ||||
-rw-r--r-- | jjb/global-templates-golang.yaml | 5 | ||||
-rw-r--r-- | jjb/global-templates-helm.yaml | 6 | ||||
-rw-r--r-- | jjb/global-templates-java.yaml | 25 | ||||
-rw-r--r-- | jjb/global-templates-python.yaml | 2 | ||||
-rw-r--r-- | jjb/global-templates-script.yaml | 5 |
7 files changed, 51 insertions, 8 deletions
diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml index 69aadc83f..9f9bdf9f1 100644 --- a/jjb/global-templates-c.yaml +++ b/jjb/global-templates-c.yaml @@ -44,6 +44,7 @@ files: '**' builders: + - lf-infra-pre-build - shell: '{script}' publishers: @@ -93,6 +94,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index 735b9823c..db3d4cfc7 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -101,6 +101,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -141,6 +142,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -186,6 +188,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -228,6 +231,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -279,6 +283,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -338,6 +343,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -382,6 +388,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -419,6 +426,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -464,6 +472,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -502,6 +511,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -553,6 +563,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -612,6 +623,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -668,6 +680,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -719,6 +732,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index a3182cc5c..e891e92df 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -45,6 +45,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -104,6 +105,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -159,6 +161,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -169,4 +172,4 @@ publishers: - infra-shiplogs: - maven-version: '{maven-version}'
\ No newline at end of file + maven-version: '{maven-version}' diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index ecc230562..6c139ddb8 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -68,6 +68,7 @@ files: '{files}' builders: + - lf-infra-pre-build - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' @@ -91,6 +92,7 @@ files: '{files}' builders: + - lf-infra-pre-build - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' @@ -125,6 +127,7 @@ comment-contains-value: '^stage-helm$' builders: + - lf-infra-pre-build - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' @@ -146,6 +149,7 @@ disabled: true builders: + - lf-infra-pre-build - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -158,6 +162,7 @@ disabled: true builders: + - lf-infra-pre-build - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -182,6 +187,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 8f17a257f..61da2d5af 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -49,6 +49,7 @@ files: '{obj:pattern}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -150,6 +151,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -217,6 +219,7 @@ project: '{project}' branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -293,6 +296,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -367,6 +371,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -444,6 +449,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -517,6 +523,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -594,6 +601,7 @@ files: '{pattern}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -640,6 +648,7 @@ name: '{project-name}-{stream}-merge-profile-java' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -724,7 +733,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -809,6 +818,7 @@ project: '{project}' branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -883,7 +893,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -951,7 +961,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1021,7 +1031,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1099,7 +1109,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1180,7 +1190,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1278,7 +1288,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1330,6 +1340,7 @@ build-timeout: 120 builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index 80ae84bb7..b30af0ea5 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -53,6 +53,7 @@ files: '{pattern}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -137,6 +138,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index 9264bc9e5..fcbf745fc 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -47,6 +47,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -122,6 +123,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -193,6 +195,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -260,6 +263,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -315,6 +319,7 @@ build-timeout: '{build-timeout}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' |