Merge "CI: Remove deprecated branches"

4 files changed, 0 insertions, 83 deletions

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 03380e9a4..856ddc7b4 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -35,10 +35,6 @@
     stream:
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
-      - "kohn":
-          branch: "kohn"
     java-version: openjdk11
     mvn-version: "mvn38"
     mvn-settings: "sdnc-apps-settings"
diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 6aa2b53f5..571cbb756 100644
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -17,10 +17,6 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
-      - "kohn":
-          branch: "kohn"
     mvn-settings: "sdnc-oam-settings"
     mvn-version: "mvn38"
     robot-options: ""
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 0b8c14d3c..479fed277 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -1,39 +1,5 @@
 ---
 - project:
-    name: sdnc-northbound-java11
-    project-name: "sdnc-northbound"
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos8-docker-8c-8g
-          cron: ""
-          sbom-generator: true
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "sdnc/northbound"
-    stream:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    mvn-version: "mvn38"
-    mvn-settings: "sdnc-northbound-settings"
-
-    # due to a strange macro / variable translation problem this needs to be
-    # passed as a string block to properly get the properties correctly defined
-    # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: "**"
-    archive-artifacts: ""
-    maven-version: "mvn38"
-    build-node: ubuntu1804-builder-4c-4g
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-
-- project:
     name: sdnc-northbound-released-java17
     project-name: "sdnc-northbound"
     jobs:
@@ -51,8 +17,6 @@
     stream:
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "sdnc-northbound-settings"
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index cbf4864eb..7f8f48ee3 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -1,42 +1,5 @@
 ---
 - project:
-    name: sdnc-oam-java11
-    project-name: "sdnc-oam"
-    jobs:
-      - gerrit-maven-verify:
-          cron: ""
-      - gerrit-maven-merge:
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-stage:
-          build-node: centos8-docker-8c-8g
-          sign-artifacts: true
-          mvn-params: "-Dmaven.test.skip=true"
-          cron: ""
-          sbom-generator: true
-      - gerrit-maven-docker-stage:
-          build-node: centos8-docker-8c-8g
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker"
-          maven-versions-plugin: true
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-    project: "sdnc/oam"
-    stream:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    mvn-version: "mvn38"
-    mvn-settings: "sdnc-oam-settings"
-    files: "**"
-    archive-artifacts: ""
-    sign-artifacts: true
-    build-node: centos8-docker-8c-8g
-    shallow-clone: true
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-
-- project:
     name: sdnc-oam-released-java17
     project-name: "sdnc-oam"
     jobs:
@@ -62,8 +25,6 @@
     stream:
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "sdnc-oam-settings"