From a2ef22be87ae20a645d473c8b4ef9e1eca00d47c Mon Sep 17 00:00:00 2001 From: Sangwook Ha Date: Sat, 10 Sep 2022 21:17:15 -0700 Subject: [PATCH] Remove odltools CSIT jobs odltools is not actively used or developed any more and its installation requirements (requests~=2.19.1) causes pip dependency resolution failure with the latest pip. Remove the CSIT jobs for odltools and also inttest-csit-1node-custom. The custom template is not used any more. Change-Id: Ie7130c7a760a0a61b344b16d4a8b6b6bd6424aed Signed-off-by: Sangwook Ha --- jjb/integration/csit-jobs-chlorine.lst | 1 - jjb/integration/csit-jobs-phosphorus.lst | 1 - jjb/integration/csit-jobs-sulfur.lst | 1 - jjb/integration/integration-templates.yaml | 51 ---------------------- jjb/odltools/odltools-csit.yaml | 29 ------------ 5 files changed, 83 deletions(-) delete mode 100644 jjb/odltools/odltools-csit.yaml diff --git a/jjb/integration/csit-jobs-chlorine.lst b/jjb/integration/csit-jobs-chlorine.lst index df9892a30..4e99cb409 100644 --- a/jjb/integration/csit-jobs-chlorine.lst +++ b/jjb/integration/csit-jobs-chlorine.lst @@ -6,7 +6,6 @@ daexim-csit-1node-basic-only-chlorine, daexim-csit-3node-clustering-basic-only-chlorine, distribution-csit-managed-chlorine, jsonrpc-csit-1node-basic-only-chlorine, -odltools-csit-1node-upstream-all-chlorine, openflowplugin-csit-1node-cbench-only-chlorine, openflowplugin-csit-1node-flow-services-all-chlorine, openflowplugin-csit-1node-perf-bulkomatic-only-chlorine, diff --git a/jjb/integration/csit-jobs-phosphorus.lst b/jjb/integration/csit-jobs-phosphorus.lst index b5c7fd3e7..07f041b9d 100644 --- a/jjb/integration/csit-jobs-phosphorus.lst +++ b/jjb/integration/csit-jobs-phosphorus.lst @@ -6,7 +6,6 @@ daexim-csit-1node-basic-only-phosphorus, daexim-csit-3node-clustering-basic-only-phosphorus, distribution-csit-managed-phosphorus, jsonrpc-csit-1node-basic-only-phosphorus, -odltools-csit-1node-upstream-all-phosphorus, openflowplugin-csit-1node-cbench-only-phosphorus, openflowplugin-csit-1node-flow-services-all-phosphorus, openflowplugin-csit-1node-perf-bulkomatic-only-phosphorus, diff --git a/jjb/integration/csit-jobs-sulfur.lst b/jjb/integration/csit-jobs-sulfur.lst index 1bbb9d8ac..edc97c78f 100644 --- a/jjb/integration/csit-jobs-sulfur.lst +++ b/jjb/integration/csit-jobs-sulfur.lst @@ -6,7 +6,6 @@ daexim-csit-1node-basic-only-sulfur, daexim-csit-3node-clustering-basic-only-sulfur, distribution-csit-managed-sulfur, jsonrpc-csit-1node-basic-only-sulfur, -odltools-csit-1node-upstream-all-sulfur, openflowplugin-csit-1node-cbench-only-sulfur, openflowplugin-csit-1node-flow-services-all-sulfur, openflowplugin-csit-1node-perf-bulkomatic-only-sulfur, diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 0e99a159b..228757c52 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -412,57 +412,6 @@ # yamllint disable-line rule:key-duplicates <<: *inttest_csit_1node -- job-template: - name: "{prefix}{project}-csit-1node-{functionality}-{install}-{stream}" - id: inttest-csit-1node-custom - <<: *inttest_csit_common - # yamllint disable-line rule:key-duplicates - <<: *inttest_csit_1node - - parameters: - - integration-csit-parameters: - archive-artifacts: "{archive-artifacts}" - branch: "{branch}" - os-cloud: "{os-cloud}" - # CSIT - bundle-url: "{bundle-url}" - repo-url: "{repo-url}" - robot-options: "{robot-options}" - # Controller - controller-scope: "{install}" - controller-max-mem: "{controller-max-mem}" - debug-map: "{debug-map}" - install-features: "{install-features}" - use-features-boot: "True" - elasticsearch-attribute: "{elasticsearch-attribute}" - karaf-based-controller: "{karaf-based-controller}" - karaf-version: "{karaf-version}" - - integration-stack-2-type: - vm_0_count: "1" - vm_0_flavor: "{odl_system_flavor}" - vm_0_image: "{odl_system_image}" - vm_1_count: "{tools_system_count}" - vm_1_flavor: "{tools_system_flavor}" - vm_1_image: "{tools_system_image}" - - integration-distribution-branch: - branch: "{branch}" - - integration-distribution-stream: - stream: "{stream}" - - integration-script-plan: - script-plan: "{project}.txt" - - integration-config-plan: - config-plan: "{project}.txt" - - integration-stream-test-plan: - stream-test-plan: "{project}-{functionality}-{stream}.txt" - - integration-test-plan: - test-plan: "{testplan}" - - integration-test-suites: - test-suites: "{test-suites}" - - integration-patch-refspec: - branch: "master" - - integration-jdk-version: - jdkversion: "{jre}" - - job-template: name: "{prefix}{project}-csit-verify-3node-{functionality}" id: inttest-csit-verify-3node diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml deleted file mode 100644 index dfb50e6dc..000000000 --- a/jjb/odltools/odltools-csit.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- project: - name: odltools-csit - jobs: - - inttest-csit-1node-custom - - inttest-csit-verify-1node - - project: odltools - tools_system_count: 0 - testplan: "{project}-basic.txt" - - stream: - - chlorine: - branch: "master" - jre: "openjdk17" - - sulfur: - branch: "stable/sulfur" - jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" - - functionality: - - "upstream" - - "gate" - - install: - - all: - scope: "all" -- 2.36.6