Fix git-scm configuration
Change-Id: Ia0b2abe1504f318d7fa0e23c616cc7c1e24c50b3
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index e4f23a2..c5cd27f 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -72,10 +72,11 @@
- scm:
name: git-scm
scm:
- - git: &git-scm-defaults
+ - git:
url: '$GIT_BASE_HTTPS/$PROJECT'
branches:
- - 'origin/$BRANCH'
+ - 'refs/heads/{branch}'
+ refspec: '{refspec}'
timeout: 15
per-build-tag: false
skip-tag: true
@@ -84,14 +85,25 @@
ignore-notify: false
wipe-workspace: true
prune: false
+ choosing-strategy: 'default'
- scm:
name: git-scm-gerrit
scm:
- git:
+ url: '$GIT_BASE_HTTPS/$PROJECT'
+ branches:
+ - 'refs/heads/{branch}'
+ refspec: '{refspec}'
+ timeout: 15
+ per-build-tag: false
+ skip-tag: true
+ shallow-clone: false
+ use-author: false
+ ignore-notify: false
+ wipe-workspace: true
+ prune: false
choosing-strategy: 'gerrit'
- refspec: '$GERRIT_REFSPEC'
- <<: *git-scm-defaults
# triggers for Nordix and upstream Gerrits
- trigger:
diff --git a/jjb/infra/jjb-merge.yaml b/jjb/infra/jjb-merge.yaml
index 96bf025..df6e097 100644
--- a/jjb/infra/jjb-merge.yaml
+++ b/jjb/infra/jjb-merge.yaml
@@ -30,7 +30,9 @@
- nordix-gerrit-parameters
scm:
- - git-scm
+ - git-scm:
+ branch: '{branch}'
+ refspec: ''
triggers:
- nordix-gerrit-trigger-change-merged:
diff --git a/jjb/infra/jjb-verify.yaml b/jjb/infra/jjb-verify.yaml
index 25f33d1..119b3b4 100644
--- a/jjb/infra/jjb-verify.yaml
+++ b/jjb/infra/jjb-verify.yaml
@@ -30,7 +30,9 @@
- nordix-gerrit-parameters
scm:
- - git-scm-gerrit
+ - git-scm-gerrit:
+ branch: '{branch}'
+ refspec: $GERRIT_REFSPEC
triggers:
- nordix-gerrit-trigger-patchset-created: