From: Vanessa Valderrama <vvalderrama@linuxfoundation.org>
Date: Tue, 2 Apr 2024 19:35:52 +0000 (+0000)
Subject: Merge "Add stable/2402 branch and remove stable/2306 branch to docker executor image... 
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=76995061460ca249a702487724e644fbd49abb6e;hp=-c;p=ci-management.git

Merge "Add stable/2402 branch and remove stable/2306 branch to docker executor image scripts"
---

76995061460ca249a702487724e644fbd49abb6e
diff --combined jjb/vpp/vpp.yaml
index 0b3483afe,4422988e4..62975f004
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -39,9 -39,6 +39,6 @@@
        - 'master':
            branch: 'master'
            branch-refspec: ''
-       - '2306':
-           branch: 'stable/2306'
-           branch-refspec: ''
        - '2310':
            branch: 'stable/2310'
            branch-refspec: ''
@@@ -74,11 -71,6 +71,6 @@@
            branch-refspec: ''
            make-test-os: 'ubuntu-20.04 ubuntu-22.04'
            make-test-multiworker-os: 'debian-11'
-       - '2306':
-           branch: 'stable/2306'
-           branch-refspec: ''
-           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
-           make-test-multiworker-os: 'debian-11'
        - '2310':
            branch: 'stable/2310'
            branch-refspec: ''
@@@ -110,9 -102,6 +102,6 @@@
        - 'master':
            branch: 'master'
            branch-refspec: ''
-       - '2306':
-           branch: 'stable/2306'
-           branch-refspec: ''
        - '2310':
            branch: 'stable/2310'
            branch-refspec: ''
@@@ -217,11 -206,6 +206,6 @@@
            branch-refspec: ''
            make-test-os: 'ubuntu-20.04 ubuntu-22.04'
            make-test-multiworker-os: ''
-       - '2306':
-           branch: 'stable/2306'
-           branch-refspec: ''
-           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
-           make-test-multiworker-os: ''
        - '2310':
            branch: 'stable/2310'
            branch-refspec: ''
@@@ -250,9 -234,6 +234,6 @@@
        - 'master':
            branch: 'master'
            branch-refspec: ''
-       - '2306':
-           branch: 'stable/2306'
-           branch-refspec: ''
        - '2310':
            branch: 'stable/2310'
            branch-refspec: ''
@@@ -264,10 -245,19 +245,15 @@@
            os: 'ubuntu2204'
            executor-arch: 'x86_64'
            skip-vote: 'true'
 -#      - 1n-tx2:
 -#          os: 'ubuntu2204'
 -#          executor-arch: 'aarch64'
 -#          skip-vote: 'false'
        - 1n-alt:
            os: 'ubuntu2204'
            executor-arch: 'aarch64'
            skip-vote: 'true'
+     exclude:
+       # 1n-alt testbed not supported
+       # in CSIT prior to 2402
+       - testbed-arch: 1n-alt
+         stream: '2310'
  # [end] VPP-CSIT-VERIFY-DEVICE PROJECT
  
  # VPP-CSIT-VERIFY-PERF PROJECT
@@@ -339,9 -329,6 +325,6 @@@
        - 'master':
            branch: 'master'
            branch-refspec: ''
-       - '2306':
-           branch: 'stable/2306'
-           branch-refspec: ''
        - '2310':
            branch: 'stable/2310'
            branch-refspec: ''