From 10dfa1443d49f3932416fbfc6ae80fe6e300080d Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Wed, 24 May 2023 17:56:53 -0400 Subject: Pin CSIT_REF to non-breaking csit gerrit refspec for vpp-csit* jobs - To avoid breakage caused by https://gerrit.fd.io/r/c/csit/+/38875 - For now, leave vpp-device jobs non-voting Change-Id: I120f4472fba51f98120cb2489150b2f751363267 Signed-off-by: Dave Wallace --- jjb/global-macros.yaml | 2 +- jjb/vpp/vpp.yaml | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 508a62174..bbb427b7b 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -85,7 +85,7 @@ parameters: - string: name: CSIT_REF - default: '' + default: '{csit-refspec}' # yamllint disable-line rule:line-length description: "GERRIT_REFSPEC parameter to override separately cloned CSIT repository, leave empty for autodetection / no override." diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 4b3a13251..72f858bc6 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -817,7 +817,8 @@ # Please keep parameters in alphabetical order parameters: - - gerrit-csit-refspec-parameter + - gerrit-csit-refspec-parameter: + csit-refspec: 'refs/changes/86/35686/77' - gerrit-event-comment-text-parameter - gerrit-event-type-parameter - gerrit-parameter: @@ -901,7 +902,8 @@ csit-perf-trial-duration: "10.0" - csit-perf-trial-multiplicity-parameter: csit-perf-trial-multiplicity: "5" - - gerrit-csit-refspec-parameter + - gerrit-csit-refspec-parameter: + csit-refspec: 'refs/changes/86/35686/77' - gerrit-event-comment-text-parameter - gerrit-event-type-parameter - gerrit-refspec-parameter: @@ -984,7 +986,8 @@ # but it does not hurt to have some flexibility for future. - csit-fail-on-crc-mismatch-parameter: fail-on-crc-mismatch: 'True' - - gerrit-csit-refspec-parameter + - gerrit-csit-refspec-parameter: + csit-refspec: 'refs/changes/86/35686/77' - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: -- cgit 1.2.3-korg