summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2016-03-23 13:58:30 +0100
committerJan Gelety <jgelety@cisco.com>2016-03-23 15:40:13 +0100
commitc4259fc024bcc68009b91be9df63c8f5da203afe (patch)
treed8c742f6e530d26921d3cd7d6e44a0176091d1cb
parent0acd490e63dffbcd4894a14b934eebc0aebe7b28 (diff)
Update of the job 'vpp-csit-verify-virl'
Job is updated to be run manually and to use csit-verified branch to test vpp. Change-Id: I7a56594cb840c374bc849c095241655290e6b0bd Signed-off-by: Jan Gelety <jgelety@cisco.com>
-rw-r--r--jjb/vpp/include-raw-vpp-csit-functional.sh2
-rw-r--r--jjb/vpp/vpp.yaml20
-rw-r--r--zuul/layout.yaml6
3 files changed, 20 insertions, 8 deletions
diff --git a/jjb/vpp/include-raw-vpp-csit-functional.sh b/jjb/vpp/include-raw-vpp-csit-functional.sh
index e0767c64..93be0adb 100644
--- a/jjb/vpp/include-raw-vpp-csit-functional.sh
+++ b/jjb/vpp/include-raw-vpp-csit-functional.sh
@@ -2,7 +2,7 @@
set -xeu -o pipefail
# Clone csit and start tests
-git clone https://gerrit.fd.io/r/csit
+git clone https://gerrit.fd.io/r/csit --branch csit-verified
cp build-root/*.deb csit/
cd csit
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 3283832a..103c72d1 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -102,7 +102,7 @@
name: 'vpp-csit-verify-virl'
project-type: freestyle
- node: verify-merge
+ node: verify
concurrent: false
logrotate:
@@ -111,17 +111,29 @@
artifactDaysToKeep: '{build-artifact-days-to-keep}'
artifactNumToKeep: '{build-artifact-num-to-keep}'
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+
scm:
- - zuul-trigger-scm:
+ - gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
- refspec: '$ZUUL_REF'
- commit: '$ZUUL_COMMIT'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
wrappers:
- ssh-agent-credentials:
users:
- '{ssh-credentials}'
+ triggers:
+ - gerrit-trigger-manually-triggered:
+ comment-trigger-value: 'manualrun'
+ name: '{project}'
+ branch: '{branch}'
+
builders:
- shell:
!include-raw-escape include-raw-vpp-build.sh
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7d46e50e..3935a112 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -125,7 +125,7 @@ projects:
# template:
# - name: default-jobs
- - name: vpp
- check-novote:
- - vpp-csit-verify-virl
+# - name: vpp
+# check-novote:
+# - vpp-csit-verify-virl