summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/global-templates-c.yaml2
-rw-r--r--jjb/global-templates-docker.yaml14
-rw-r--r--jjb/global-templates-golang.yaml5
-rw-r--r--jjb/global-templates-helm.yaml6
-rw-r--r--jjb/global-templates-java.yaml25
-rw-r--r--jjb/global-templates-python.yaml2
-rw-r--r--jjb/global-templates-script.yaml5
-rw-r--r--jjb/multicloud/multicloud-azure-csit.yaml13
-rw-r--r--jjb/optf/optf-cmso.yaml3
9 files changed, 66 insertions, 9 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 8d1c40db8..3052dc2db 100644
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -100,6 +100,7 @@
<<: *docker_merge_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -140,6 +141,7 @@
<<: *docker_merge_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -185,6 +187,7 @@
<<: *docker_verify_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -227,6 +230,7 @@
<<: *docker_verify_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -277,6 +281,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -335,6 +340,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -379,6 +385,7 @@
<<: *docker_merge_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -416,6 +423,7 @@
<<: *docker_merge_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -461,6 +469,7 @@
<<: *docker_verify_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -499,6 +508,7 @@
<<: *docker_verify_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -549,6 +559,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -607,6 +618,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -662,6 +674,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -712,6 +725,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 79a00778a..664d14ea3 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -67,6 +67,7 @@
files: '{files}'
builders:
+ - lf-infra-pre-build
- shell: '{obj:pre_build_script}'
- shell: '{obj:build_script}'
@@ -90,6 +91,7 @@
files: '{files}'
builders:
+ - lf-infra-pre-build
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
@@ -124,6 +126,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}'
@@ -145,6 +148,7 @@
disabled: true
builders:
+ - lf-infra-pre-build
- shell: '{pre_build_script}'
- shell: '{build_script}'
- shell: '{post_build_script}'
@@ -157,6 +161,7 @@
disabled: true
builders:
+ - lf-infra-pre-build
- shell: '{pre_build_script}'
- shell: '{build_script}'
- shell: '{post_build_script}'
@@ -180,6 +185,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}'
diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml
new file mode 100644
index 000000000..10946318a
--- /dev/null
+++ b/jjb/multicloud/multicloud-azure-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+ name: multicloud-azure-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'multicloud-azure'
+ stream: 'master'
+ functionality:
+ - 'functionality1':
+ trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 788e75217..39253cd9e 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -39,7 +39,8 @@
- project:
name: optf-cmso-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-maven-sonar:
+ mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
cron: 'H 11 * * *'
build-node: ubuntu1604-docker-8c-8g
project: 'optf/cmso'