Merge "CI: Remove deprecated branches"

11 files changed, 0 insertions, 52 deletions

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index d57586f1c..86f795aaa 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -22,10 +22,6 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
     mvn-settings: "aai-aai-common-settings"
     mvn-version: "mvn35"
     files: "**"
@@ -84,14 +80,6 @@
           branch: "master"
           distro: "alpine"
           mvn-params: "docker"
-      - "jakarta":
-          branch: "jakarta"
-          distro: "alpine"
-          mvn-params: "docker"
-      - "kohn":
-          branch: "kohn"
-          distro: "alpine"
-          mvn-params: "docker"
     docker-name: "onap/aai-common-{distro}"
     docker-build-args: "-f ./Dockerfile.{distro}"
     docker-root: "$WORKSPACE/Dockerfiles/aai-common/"
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 6c50df1e4..c4d15cfa1 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -27,10 +27,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/babel"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-babel-settings"
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 5315e2d0a..18622c6d5 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -28,10 +28,6 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "aai-graphadmin-settings"
     mvn-version: "mvn35"
     files: "**"
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 44024d2f5..df11636cc 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -20,10 +20,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/logging-service"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-logging-service-settings"
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index deca66156..ba29a79ec 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -26,10 +26,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/model-loader"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-model-loader-settings"
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 7bb550b23..19aa0bdf7 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -32,10 +32,6 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "aai-resources-settings"
     mvn-version: "mvn35"
     files: "**"
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index f17b62d81..a4f084465 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -20,10 +20,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/rest-client"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-rest-client-settings"
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 91e220d56..bc8d219fe 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -28,10 +28,6 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "aai-schema-service-settings"
     mvn-version: "mvn36"
     files: "**"
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index d5b182927..7f86a1173 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -26,10 +26,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/sparky-be"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-sparky-be-settings"
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 110486fb0..001573456 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -14,10 +14,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/sparky-fe"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-sparky-fe-settings"
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 01493e40c..b10dafe34 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -31,10 +31,6 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "aai-traversal-settings"
     mvn-version: "mvn35"
     files: "**"