From 7b7ffa99873e679b637ef00a3953ddd1f5a28aae Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Thu, 25 Jan 2024 16:09:00 -0500 Subject: Add stable/2402 branch and remove stable/2306 branch to docker executor image scripts - Refactor csit_pip_cache function to use csit bash functions that activate the python virtualenv in production jobs. - Remove stable/2306 branch due to pip issue https://github.com/pypa/pip/issues/11527 causing extraneous downloading of pip wheels in CSIT jobs. - Remove installation of packages for old CSIT docs generation. Change-Id: Ib63aa654a35ad01fbfb5b7f593d3f8ffa6499b07 Signed-off-by: Dave Wallace --- jjb/vpp/docs.yaml | 3 --- jjb/vpp/vpp.yaml | 27 +++++---------------------- 2 files changed, 5 insertions(+), 25 deletions(-) (limited to 'jjb') diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 8480ef3af..006801f41 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -15,9 +15,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2306': - branch: 'stable/2306' - branch-refspec: '' - '2310': branch: 'stable/2310' branch-refspec: '' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index fbf947943..4422988e4 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -39,9 +39,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2306': - branch: 'stable/2306' - branch-refspec: '' - '2310': branch: 'stable/2310' branch-refspec: '' @@ -74,11 +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 @@ - 'master': branch: 'master' branch-refspec: '' - - '2306': - branch: 'stable/2306' - branch-refspec: '' - '2310': branch: 'stable/2310' branch-refspec: '' @@ -217,11 +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 @@ - 'master': branch: 'master' branch-refspec: '' - - '2306': - branch: 'stable/2306' - branch-refspec: '' - '2310': branch: 'stable/2310' branch-refspec: '' @@ -272,6 +253,11 @@ 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 @@ -343,9 +329,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2306': - branch: 'stable/2306' - branch-refspec: '' - '2310': branch: 'stable/2310' branch-refspec: '' -- cgit 1.2.3-korg