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 <sangwook.ha@verizon.com>

diff --git a/jjb/integration/csit-jobs-chlorine.lst b/jjb/integration/csit-jobs-chlorine.lst
index df9892a308a6e8a661874e5a44411f8b9ac69843..4e99cb4090d985d781340a135182596cfb66f52c 100644 (file)
--- 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 b5c7fd3e774c5d3695e6ced05e9acf3df4dab5be..07f041b9dd55582b7c6210990df02c17f1db3b20 100644 (file)
--- 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 1bbb9d8ac6b26633db29f44e0b41577e19689f80..edc97c78f74e4b508e86542fb305d4c64fdce260 100644 (file)
--- 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 0e99a159b3b363b5900eda020910b7d73b4a7e25..228757c52bed43e6ddf7991ac47d0f035793526a 100644 (file)
--- 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 (file)
index dfb50e6..0000000
--- 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"