summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2016-12-12 07:22:19 +0000
committerRyota MIBU <r-mibu@cq.jp.nec.com>2016-12-19 00:06:06 +0000
commitb2bc05dad00f551cdcaa10c4f3864adc67639dbf (patch)
tree57fc065f79968b7128f978db2e7d6e83d4be8a2e
parentf012d1984209359034c326227b9c6a6b31eeb060 (diff)
clean scm defenitions
This patch makes sure we use 2 types of scm, and allows us to specify them by adding one line in job-templates. - git-scm # for daily jobs and merge jobs - git-scm-gerrit # for verify jobs [New] Change-Id: Iddc8a5e0e115193c7081a6d6c53da209900e95c8 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
-rw-r--r--jjb-sandbox/releng/releng-sandbox-jobs.yml5
-rw-r--r--jjb/3rd_party_ci/odl-netvirt.yml4
-rw-r--r--jjb/apex/apex.yml40
-rw-r--r--jjb/armband/armband-ci-jobs.yml5
-rw-r--r--jjb/armband/armband-project-jobs.yml5
-rw-r--r--jjb/armband/armband-verify-jobs.yml18
-rw-r--r--jjb/availability/availability.yml5
-rw-r--r--jjb/barometer/barometer.yml15
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml5
-rw-r--r--jjb/bottlenecks/bottlenecks-project-jobs.yml15
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml5
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml10
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml18
-rw-r--r--jjb/conductor/conductor.yml5
-rw-r--r--jjb/copper/copper.yml5
-rw-r--r--jjb/cperf/cperf-ci-jobs.yml5
-rw-r--r--jjb/daisy4nfv/daisy4nfv-merge-jobs.yml18
-rw-r--r--jjb/daisy4nfv/daisy4nfv-verify-jobs.yml18
-rw-r--r--jjb/doctor/doctor.yml10
-rw-r--r--jjb/domino/domino.yml5
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yml5
-rw-r--r--jjb/dovetail/dovetail-project-jobs.yml10
-rw-r--r--jjb/dpacc/dpacc.yml5
-rw-r--r--jjb/escalator/escalator.yml36
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml5
-rw-r--r--jjb/fuel/fuel-plugin-verify-jobs.yml8
-rw-r--r--jjb/fuel/fuel-project-jobs.yml28
-rw-r--r--jjb/fuel/fuel-verify-jobs-experimental.yml18
-rw-r--r--jjb/fuel/fuel-verify-jobs.yml18
-rw-r--r--jjb/functest/functest-ci-jobs.yml5
-rw-r--r--jjb/functest/functest-project-jobs.yml5
-rw-r--r--jjb/global/releng-defaults.yml6
-rw-r--r--jjb/global/releng-macros.yml33
-rw-r--r--jjb/ipv6/ipv6.yml5
-rw-r--r--jjb/joid/joid-daily-jobs.yml5
-rw-r--r--jjb/joid/joid-verify-jobs.yml18
-rw-r--r--jjb/kvmfornfv/kvmfornfv.yml28
-rw-r--r--jjb/moon/moon.yml5
-rw-r--r--jjb/multisite/multisite.yml15
-rw-r--r--jjb/netready/netready.yml10
-rw-r--r--jjb/octopus/octopus.yml5
-rw-r--r--jjb/onosfw/onosfw.yml15
-rw-r--r--jjb/opnfvdocs/opnfvdocs.yml15
-rw-r--r--jjb/ovsnfv/ovsnfv.yml15
-rw-r--r--jjb/parser/parser.yml5
-rw-r--r--jjb/pharos/pharos.yml5
-rw-r--r--jjb/prediction/prediction.yml5
-rw-r--r--jjb/promise/promise.yml5
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml5
-rw-r--r--jjb/qtip/qtip-project-jobs.yml5
-rw-r--r--jjb/releng/artifact-cleanup.yml5
-rw-r--r--jjb/releng/opnfv-docker.yml10
-rw-r--r--jjb/releng/opnfv-docs.yml10
-rw-r--r--jjb/releng/opnfv-lint.yml5
-rw-r--r--jjb/releng/releng-ci-jobs.yml15
-rw-r--r--jjb/securityscanning/opnfv-security-scan.yml5
-rw-r--r--jjb/storperf/storperf.yml15
-rw-r--r--jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml5
-rw-r--r--jjb/vswitchperf/vswitchperf.yml15
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml5
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yml10
61 files changed, 151 insertions, 513 deletions
diff --git a/jjb-sandbox/releng/releng-sandbox-jobs.yml b/jjb-sandbox/releng/releng-sandbox-jobs.yml
index aa10a4327..adefe363e 100644
--- a/jjb-sandbox/releng/releng-sandbox-jobs.yml
+++ b/jjb-sandbox/releng/releng-sandbox-jobs.yml
@@ -16,10 +16,7 @@
- gerrit-parameter:
branch: 'master'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 3dd4c0b44..4a65dcbb7 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -166,9 +166,7 @@
block-level: 'NODE'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index d8784c678..9c1dedc03 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -60,10 +60,7 @@
description: "Used for overriding the GIT URL coming from parameters macro."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -117,10 +114,7 @@
description: "Used for overriding the GIT URL coming from parameters macro."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -223,10 +217,7 @@
description: "Used for overriding the GIT URL coming from parameters macro."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
properties:
- build-blocker:
@@ -283,10 +274,7 @@
description: "Used for overriding the GIT URL coming from parameters macro."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
properties:
- build-blocker:
@@ -341,10 +329,7 @@
description: "Used for overriding the GIT URL coming from parameters macro."
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
properties:
- build-blocker:
@@ -384,10 +369,7 @@
disabled: false
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
parameters:
- project-parameter:
@@ -431,10 +413,7 @@
disabled: false
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
parameters:
- project-parameter:
@@ -474,10 +453,7 @@
disabled: false
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
parameters:
- project-parameter:
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 77718e181..2c355b750 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -209,10 +209,7 @@
gs-pathname: '{gs-pathname}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
wrappers:
- build-name:
diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml
index 4b2a7b50e..64c320dbd 100644
--- a/jjb/armband/armband-project-jobs.yml
+++ b/jjb/armband/armband-project-jobs.yml
@@ -41,10 +41,7 @@
gs-pathname: '{gs-pathname}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- pollscm:
diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index f99ed572c..9bfe4f4fd 100644
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -53,15 +53,10 @@
option: 'project'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -184,15 +179,10 @@
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml
index 485010def..ae9f163e6 100644
--- a/jjb/availability/availability.yml
+++ b/jjb/availability/availability.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/barometer/barometer.yml b/jjb/barometer/barometer.yml
index c763f3001..4afe40e38 100644
--- a/jjb/barometer/barometer.yml
+++ b/jjb/barometer/barometer.yml
@@ -35,10 +35,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -94,10 +91,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit:
@@ -148,10 +142,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- timed: '@midnight'
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 7f2e6bf8a..48cca0dae 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -119,10 +119,7 @@
description: "docker image tag used for version control"
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- 'bottlenecks-env-cleanup'
diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml
index 27eb01afa..e5066aace 100644
--- a/jjb/bottlenecks/bottlenecks-project-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml
@@ -47,10 +47,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -88,10 +85,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit:
@@ -134,10 +128,7 @@
gs-packagepath: '{gs-packagepath}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- 'bottlenecks-builder-upload-artifact'
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 0d97fef75..e9d1f5302 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -197,10 +197,7 @@
- '{installer}-defaults'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
wrappers:
- build-name:
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 50ff072fb..ac132a577 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -45,10 +45,7 @@
- '{installer}-defaults'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- timed: 'H 8 * * *'
@@ -86,10 +83,7 @@
- '{node}-defaults'
- '{installer}-defaults'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- shell:
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 69cc958a8..3a11b1e0a 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -64,15 +64,10 @@
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 120
fail: true
@@ -174,15 +169,10 @@
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 120
fail: true
diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index 15a3b59e1..f9978804f 100644
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml
index 80ad9294e..9c736db7c 100644
--- a/jjb/copper/copper.yml
+++ b/jjb/copper/copper.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml
index d6c8601c6..d57d87bac 100644
--- a/jjb/cperf/cperf-ci-jobs.yml
+++ b/jjb/cperf/cperf-ci-jobs.yml
@@ -65,10 +65,7 @@
docker-tag: '{docker-tag}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- 'cperf-{testsuite}-builder'
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 5964adb32..b7a5fec92 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -49,15 +49,10 @@
option: 'project'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -183,15 +178,10 @@
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index bd9f1b51e..cba22643c 100644
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -47,15 +47,10 @@
option: 'project'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -173,15 +168,10 @@
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index f9ee3de79..2e26071d7 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -41,10 +41,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -130,10 +127,7 @@
description: "Show debug output information"
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/domino/domino.yml b/jjb/domino/domino.yml
index d34f8fadf..b6533009e 100644
--- a/jjb/domino/domino.yml
+++ b/jjb/domino/domino.yml
@@ -29,10 +29,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 0c7dbe33a..6f3ed128b 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -202,10 +202,7 @@
description: "Directory where the dovetail repository is cloned"
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{dovetail-branch}'
+ - git-scm
builders:
- description-setter:
diff --git a/jjb/dovetail/dovetail-project-jobs.yml b/jjb/dovetail/dovetail-project-jobs.yml
index 07106f609..826684919 100644
--- a/jjb/dovetail/dovetail-project-jobs.yml
+++ b/jjb/dovetail/dovetail-project-jobs.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -73,10 +70,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit:
diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml
index bcad2a329..3eb581ec1 100644
--- a/jjb/dpacc/dpacc.yml
+++ b/jjb/dpacc/dpacc.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/escalator/escalator.yml b/jjb/escalator/escalator.yml
index 11da789f0..4149ee93c 100644
--- a/jjb/escalator/escalator.yml
+++ b/jjb/escalator/escalator.yml
@@ -45,15 +45,10 @@
option: 'project'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -131,15 +126,10 @@
concurrent: true
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -174,15 +164,10 @@
option: 'project'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -254,15 +239,10 @@
concurrent: true
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index 6c2d6f021..a714eeabf 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -220,10 +220,7 @@
description: 'Deployment timeout in minutes'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
wrappers:
- build-name:
diff --git a/jjb/fuel/fuel-plugin-verify-jobs.yml b/jjb/fuel/fuel-plugin-verify-jobs.yml
index 4fea26b32..bf847edfe 100644
--- a/jjb/fuel/fuel-plugin-verify-jobs.yml
+++ b/jjb/fuel/fuel-plugin-verify-jobs.yml
@@ -71,9 +71,7 @@
wipe-workspace: true
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -195,9 +193,7 @@
wipe-workspace: true
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 2aa17abd5..0b416e35e 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -56,10 +56,7 @@
gs-pathname: '{gs-pathname}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- timed: '0 H/4 * * *'
@@ -99,15 +96,10 @@
gs-pathname: '{gs-pathname}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -175,15 +167,10 @@
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
triggers:
- gerrit:
@@ -265,10 +252,7 @@
gs-pathname: '{gs-pathname}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
wrappers:
- build-name:
diff --git a/jjb/fuel/fuel-verify-jobs-experimental.yml b/jjb/fuel/fuel-verify-jobs-experimental.yml
index cc16133f6..3aa85b22d 100644
--- a/jjb/fuel/fuel-verify-jobs-experimental.yml
+++ b/jjb/fuel/fuel-verify-jobs-experimental.yml
@@ -58,15 +58,10 @@
option: 'project'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -191,15 +186,10 @@
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml
index 7b8656800..fe8985392 100644
--- a/jjb/fuel/fuel-verify-jobs.yml
+++ b/jjb/fuel/fuel-verify-jobs.yml
@@ -53,15 +53,10 @@
option: 'project'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -186,15 +181,10 @@
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index a578fcecd..40b795bcc 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -237,10 +237,7 @@
gs-pathname: '{gs-pathname}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- description-setter:
diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
index 888f0ed79..11bc364e1 100644
--- a/jjb/functest/functest-project-jobs.yml
+++ b/jjb/functest/functest-project-jobs.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/global/releng-defaults.yml b/jjb/global/releng-defaults.yml
index bf3330657..5003a8f48 100644
--- a/jjb/global/releng-defaults.yml
+++ b/jjb/global/releng-defaults.yml
@@ -9,13 +9,9 @@
artifactDaysToKeep: 30
artifactNumToKeep: 100
- ssh-credentials: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
project-type: freestyle
node: master
-
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 3afd355e6..46f69b327 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -23,31 +23,34 @@
name: GERRIT_BRANCH
default: '{branch}'
description: "JJB configured GERRIT_BRANCH parameter"
+ - string:
+ name: SSH_CREDENTIAL_ID
+ default: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
+ description: "SSH Credential ID for git access"
+
+- wrapper:
+ name: ssh-agent-wrapper
+ wrappers:
+ - ssh-agent-credentials:
+ users:
+ - '$SSH_CREDENTIAL_ID'
- scm:
name: git-scm
scm:
- - git:
- credentials-id: '{credentials-id}'
+ - git: &git-scm-defaults
+ credentials-id: '$SSH_CREDENTIAL_ID'
url: '$GIT_BASE'
- refspec: ''
branches:
- - 'origin/{branch}'
- skip-tag: true
- wipe-workspace: true
+ - 'origin/$GERRIT_BRANCH'
+ timeout: 15
- scm:
- name: gerrit-trigger-scm
+ name: git-scm-gerrit
scm:
- git:
- credentials-id: '{credentials-id}'
- url: '$GIT_BASE'
- refspec: '{refspec}'
- branches:
- - 'origin/$GERRIT_BRANCH'
- skip-tag: true
- choosing-strategy: '{choosing-strategy}'
- timeout: 15
+ choosing-strategy: 'gerrit'
+ <<: *git-scm-defaults
- trigger:
name: 'daily-trigger-disabled'
diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml
index 069599e82..db662aed8 100644
--- a/jjb/ipv6/ipv6.yml
+++ b/jjb/ipv6/ipv6.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 6d0370983..5da301974 100644
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -186,10 +186,7 @@
default: 'os-odl_l2-nofeature-ha'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- description-setter:
diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml
index 649c31bea..516e822a7 100644
--- a/jjb/joid/joid-verify-jobs.yml
+++ b/jjb/joid/joid-verify-jobs.yml
@@ -58,15 +58,10 @@
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -168,15 +163,10 @@
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index 1c2bf5053..a708c8af2 100644
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -117,15 +117,10 @@
concurrent: true
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
@@ -158,10 +153,7 @@
gs-pathname: '{gs-pathname}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit:
@@ -200,10 +192,7 @@
gs-pathname: '{gs-pathname}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- timed: '@midnight'
@@ -240,15 +229,10 @@
concurrent: false
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
diff --git a/jjb/moon/moon.yml b/jjb/moon/moon.yml
index a52cf2cd1..15c3ddec8 100644
--- a/jjb/moon/moon.yml
+++ b/jjb/moon/moon.yml
@@ -22,10 +22,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/multisite/multisite.yml b/jjb/multisite/multisite.yml
index 8e542995e..cfe9b2d13 100644
--- a/jjb/multisite/multisite.yml
+++ b/jjb/multisite/multisite.yml
@@ -39,10 +39,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -96,10 +93,7 @@
default: 'os-nosdn-multisite-ha'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- timed: '{timed}'
@@ -128,10 +122,7 @@
concurrent: false
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
builders:
- 'multisite-kingbird-deploy'
diff --git a/jjb/netready/netready.yml b/jjb/netready/netready.yml
index eff7b8701..3d043f9e3 100644
--- a/jjb/netready/netready.yml
+++ b/jjb/netready/netready.yml
@@ -24,10 +24,7 @@
- gerrit-parameter:
branch: '{branch}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -75,10 +72,7 @@
gs-pathname: '{gs-pathname}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- 'netready-gluon-build'
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 741aa0905..71d6a41fe 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -32,10 +32,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml
index 33ede475f..c866d89b5 100644
--- a/jjb/onosfw/onosfw.yml
+++ b/jjb/onosfw/onosfw.yml
@@ -36,10 +36,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -78,10 +75,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- timed: '@midnight'
@@ -107,10 +101,7 @@
description: "Directory where the build artifact will be located upon the completion of the build."
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- 'builder-onosfw-helloworld'
diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 724ef6aab..d8cfabc05 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -42,10 +42,7 @@
description: "Used for overriding the GIT URL coming from parameters macro."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -90,10 +87,7 @@
description: "Directory where the build artifact will be located upon the completion of the build."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -134,10 +128,7 @@
description: 'Specify the branch in this way in order to be able to use build-opnfv-composite-docs builder.'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- timed: '0 H/6 * * *'
diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 28d268379..0492f96a4 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -35,10 +35,7 @@
description: "Directory where the build artifact will be located upon the completion of the build."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -85,10 +82,7 @@
description: "Directory where the build artifact will be located upon the completion of the build."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
wrappers:
- timeout:
@@ -132,10 +126,7 @@
description: "Directory where the build artifact will be located upon the completion of the build."
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
wrappers:
- timeout:
diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index cd6c6e093..50c7d2585 100644
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 92216ee35..1a605d395 100644
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
index 951188ce2..c0066bf7f 100644
--- a/jjb/prediction/prediction.yml
+++ b/jjb/prediction/prediction.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml
index f620f6f9e..38e181476 100644
--- a/jjb/promise/promise.yml
+++ b/jjb/promise/promise.yml
@@ -33,10 +33,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index ac9854365..167cb2a2a 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -55,10 +55,7 @@
description: 'Tag to pull docker image'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- '{auto-trigger-name}'
diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml
index 8798fd115..a9c8251fc 100644
--- a/jjb/qtip/qtip-project-jobs.yml
+++ b/jjb/qtip/qtip-project-jobs.yml
@@ -28,10 +28,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/releng/artifact-cleanup.yml b/jjb/releng/artifact-cleanup.yml
index 1c609a4b2..ce1da75d9 100644
--- a/jjb/releng/artifact-cleanup.yml
+++ b/jjb/releng/artifact-cleanup.yml
@@ -29,10 +29,7 @@
project: '{project}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- timed: 'H H * * *'
diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 4813a8877..3df8be1e7 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -82,11 +82,8 @@
default: ""
description: "Release version, e.g. 1.0, 2.0, 3.0"
- scm: &scm
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ scm:
+ - git-scm
builders: &builders
- shell:
@@ -100,7 +97,8 @@
name: '{project}-docker-build-push-monitor-{stream}'
disabled: '{obj:disabled}'
parameters: *parameters
- scm: *scm
+ scm:
+ - git-scm
builders: *builders
# trigger only matching the file name
diff --git a/jjb/releng/opnfv-docs.yml b/jjb/releng/opnfv-docs.yml
index a18374592..cd70a80e4 100644
--- a/jjb/releng/opnfv-docs.yml
+++ b/jjb/releng/opnfv-docs.yml
@@ -39,10 +39,7 @@
branch: '{branch}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -92,10 +89,7 @@
description: "JJB configured GERRIT_REFSPEC parameter"
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index c2624debc..7115cce48 100644
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -36,10 +36,7 @@
branch: '{branch}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index fc77c2d48..626daffbd 100644
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -16,10 +16,7 @@
- gerrit-parameter:
branch: 'master'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -71,10 +68,7 @@
branch: 'master'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit:
@@ -114,10 +108,7 @@
branch: 'master'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- timed: '@hourly'
diff --git a/jjb/securityscanning/opnfv-security-scan.yml b/jjb/securityscanning/opnfv-security-scan.yml
index 546f4e7e5..96f64a8cc 100644
--- a/jjb/securityscanning/opnfv-security-scan.yml
+++ b/jjb/securityscanning/opnfv-security-scan.yml
@@ -31,10 +31,7 @@
branch: '{branch}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 4e72af50b..d42540dda 100644
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -36,10 +36,7 @@
description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -100,10 +97,7 @@
description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit:
@@ -159,10 +153,7 @@
project: '{project}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- timed: 'H H * * *'
diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
index 6dd3acf3a..54e83386b 100644
--- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
+++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
@@ -27,10 +27,7 @@
- gerrit-parameter:
branch: '{branch}'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index cda5128e2..681b38436 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -33,10 +33,7 @@
- 'intel-pod3-defaults'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- pollscm:
@@ -78,10 +75,7 @@
- '{slave-label}-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -142,10 +136,7 @@
- '{slave-label}-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit:
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 9d80e42ae..271adb7bf 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -258,10 +258,7 @@
description: "Show debut output information"
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- description-setter:
diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index afa6b7844..48c9d9d56 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -38,10 +38,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -82,10 +79,7 @@
description: "Directory where the build artifact will be located upon the completion of the build."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit: