From 49313778a33101a740469583dae731e6dc9a46ba Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Fri, 26 May 2023 09:34:00 +0200
Subject: Re-enable voting for vpp-csit device jobs

With both 38877 and 38899 merged, CSIT should be stable again.

This reverts commit 10dfa1443d49f3932416fbfc6ae80fe6e300080d.
This reverts commit cf55023ecfbde00ddcba7b540a2220b0c6e84a9c.

Some improvements in those could be kept,
but this change just restores the previous lines.

Change-Id: Ibb6185eea81037c3edfe790a56063c45f350e178
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 jjb/global-macros.yaml |  2 +-
 jjb/vpp/vpp.yaml       | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index bbb427b7b..508a62174 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -85,7 +85,7 @@
     parameters:
       - string:
           name: CSIT_REF
-          default: '{csit-refspec}'
+          default: ''
           # 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 72f858bc6..55b0b1ad8 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -246,6 +246,7 @@
       - 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}':
           make-parallel-jobs: '32'
     project: 'vpp'
+    skip-vote: 'false'
     stream:
       - 'master':
           branch: 'master'
@@ -260,11 +261,10 @@
       - 1n-skx:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
-          skip-vote: 'true'
       - 1n-tx2:
           os: 'ubuntu2204'
           executor-arch: 'aarch64'
-          skip-vote: 'true'
+          skip-vote: 'false'
 # [end] VPP-CSIT-VERIFY-DEVICE PROJECT
 
 # VPP-CSIT-VERIFY-PERF PROJECT
@@ -817,8 +817,7 @@
 
     # Please keep parameters in alphabetical order
     parameters:
-      - gerrit-csit-refspec-parameter:
-          csit-refspec: 'refs/changes/86/35686/77'
+      - gerrit-csit-refspec-parameter
       - gerrit-event-comment-text-parameter
       - gerrit-event-type-parameter
       - gerrit-parameter:
@@ -902,8 +901,7 @@
           csit-perf-trial-duration: "10.0"
       - csit-perf-trial-multiplicity-parameter:
           csit-perf-trial-multiplicity: "5"
-      - gerrit-csit-refspec-parameter:
-          csit-refspec: 'refs/changes/86/35686/77'
+      - gerrit-csit-refspec-parameter
       - gerrit-event-comment-text-parameter
       - gerrit-event-type-parameter
       - gerrit-refspec-parameter:
@@ -986,8 +984,7 @@
       # 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:
-          csit-refspec: 'refs/changes/86/35686/77'
+      - gerrit-csit-refspec-parameter
       - gerrit-parameter:
           branch: '{branch}'
       - gerrit-refspec-parameter:
-- 
cgit 1.2.3-korg