Remove development branch builds

Change-Id: I0bd4e37dd32d804a8e093501a060149ee9adc73d
Signed-off-by: Eby, Robert (re2429) <re2429@att.com>

diff --git a/jjb/addon-onap/addon-onap.yaml b/jjb/addon-onap/addon-onap.yaml
index f224dbb..a25cf40 100644 (file)
--- a/jjb/addon-onap/addon-onap.yaml
+++ b/jjb/addon-onap/addon-onap.yaml
@@ -19,14 +19,11 @@
     project-name: addon-onap
     project: addon-onap
     build-node: centos7-builder-2c-1g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     mvn-settings: addon-onap-settings
     group-id: org.akraino.addon-onap
     refspec: refs/heads/master
+    branch: master
     jobs:
       - akraino-project-stream-release-config
       - akraino-project-stream-stage-config

diff --git a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml
index d183344..869a68e 100644 (file)
--- a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml
+++ b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml
@@ -19,14 +19,11 @@
     project-name: airshipinabottle_deploy
     project: airshipinabottle_deploy
     build-node: centos7-builder-2c-1g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     mvn-settings: airshipinabottle_deploy-settings
     group-id: org.akraino.airshipinabottle_deploy
     refspec: refs/heads/master
+    branch: master
     jobs:
       - akraino-project-stream-release-config
       - akraino-project-stream-stage-config

diff --git a/jjb/camunda_workflow/camunda_workflow-docker.yaml b/jjb/camunda_workflow/camunda_workflow-docker.yaml
index 2d6fff6..334e2cb 100644 (file)
--- a/jjb/camunda_workflow/camunda_workflow-docker.yaml
+++ b/jjb/camunda_workflow/camunda_workflow-docker.yaml
@@ -20,11 +20,7 @@
     project: camunda_workflow
     global-settings-file: global-settings
     build-node: ubuntu1604-docker-8c-8g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     java-version: openjdk8
     mvn-version: mvn35
     mvn-opts: ''
@@ -32,6 +28,7 @@
     mvn-settings: camunda_workflow-settings
     build-timeout: 60
     submodule-recursive: true
+    branch: master
     jobs:
       - 'akraino-project-stream-docker'
       - 'akraino-project-stream-stage-docker'

diff --git a/jjb/camunda_workflow/camunda_workflow.yaml b/jjb/camunda_workflow/camunda_workflow.yaml
index 3c918e2..110fcb7 100644 (file)
--- a/jjb/camunda_workflow/camunda_workflow.yaml
+++ b/jjb/camunda_workflow/camunda_workflow.yaml
@@ -22,24 +22,9 @@
     mvn-params: '-f akraino/pom.xml'
     nexus-iq-namespace: 'akraino-'
     build-node: centos7-builder-2c-1g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     jobs:
       - '{project-name}-maven-jobs'
+      - gerrit-maven-sonar
     views:
       - project-view
-
-# Only run Sonar on the development branch
-- project:
-    name: camunda_workflow-sonar-development
-    project: camunda_workflow
-    project-name: camunda_workflow
-    mvn-settings: camunda_workflow-settings
-    mvn-params: '-f akraino/pom.xml'
-    build-node: centos7-builder-2c-1g
-    stream: development
-    jobs:
-      - gerrit-maven-sonar

diff --git a/jjb/portal_user_interface/portal_user_interface-docker.yaml b/jjb/portal_user_interface/portal_user_interface-docker.yaml
index ea64d5e..f11996b 100644 (file)
--- a/jjb/portal_user_interface/portal_user_interface-docker.yaml
+++ b/jjb/portal_user_interface/portal_user_interface-docker.yaml
@@ -20,11 +20,7 @@
     project: portal_user_interface
     global-settings-file: global-settings
     build-node: ubuntu1604-docker-8c-8g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     java-version: openjdk8
     mvn-version: mvn35
     mvn-opts: ''
@@ -32,6 +28,7 @@
     mvn-settings: portal_user_interface-settings
     build-timeout: 60
     submodule-recursive: true
+    branch: master
     jobs:
       - 'akraino-project-stream-docker'
       - 'akraino-project-stream-stage-docker'

diff --git a/jjb/portal_user_interface/portal_user_interface.yaml b/jjb/portal_user_interface/portal_user_interface.yaml
index ed140f5..40142c1 100644 (file)
--- a/jjb/portal_user_interface/portal_user_interface.yaml
+++ b/jjb/portal_user_interface/portal_user_interface.yaml
@@ -22,24 +22,9 @@
     mvn-params: '-f AECPortalMgmt/pom.xml'
     nexus-iq-namespace: 'akraino-'
     build-node: centos7-builder-2c-1g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     jobs:
       - '{project-name}-maven-jobs'
+      - gerrit-maven-sonar
     views:
       - project-view
-
-# Only run Sonar on the development branch
-- project:
-    name: portal_user_interface-sonar-development
-    project: portal_user_interface
-    project-name: portal_user_interface
-    mvn-settings: portal_user_interface-settings
-    mvn-params: '-f AECPortalMgmt/pom.xml'
-    build-node: centos7-builder-2c-1g
-    stream: development
-    jobs:
-      - gerrit-maven-sonar

diff --git a/jjb/postgres_db_schema/postgres_db_schema.yaml b/jjb/postgres_db_schema/postgres_db_schema.yaml
index feddb06..d5ec9b8 100644 (file)
--- a/jjb/postgres_db_schema/postgres_db_schema.yaml
+++ b/jjb/postgres_db_schema/postgres_db_schema.yaml
@@ -20,11 +20,7 @@
     project: postgres_db_schema
     global-settings-file: global-settings
     build-node: ubuntu1604-docker-8c-8g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     java-version: openjdk8
     mvn-version: mvn35
     mvn-opts: ''
@@ -32,6 +28,7 @@
     mvn-settings: postgres_db_schema-settings
     build-timeout: 60
     submodule-recursive: true
+    branch: master
     jobs:
       - 'akraino-project-stream-docker'
       - 'akraino-project-stream-stage-docker'

diff --git a/jjb/redfish/redfish-docker.yaml b/jjb/redfish/redfish-docker.yaml
index 7cf6486..fa25a4e 100644 (file)
--- a/jjb/redfish/redfish-docker.yaml
+++ b/jjb/redfish/redfish-docker.yaml
@@ -20,11 +20,7 @@
     project: redfish
     global-settings-file: global-settings
     build-node: ubuntu1604-docker-8c-8g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     java-version: openjdk8
     mvn-version: mvn35
     mvn-opts: ''
@@ -32,6 +28,7 @@
     mvn-settings: redfish-settings
     build-timeout: 60
     submodule-recursive: true
+    branch: master
     jobs:
       - 'akraino-project-stream-docker'
       - 'akraino-project-stream-stage-docker'

diff --git a/jjb/redfish/redfish.yaml b/jjb/redfish/redfish.yaml
index bab04b1..5d1e880 100644 (file)
--- a/jjb/redfish/redfish.yaml
+++ b/jjb/redfish/redfish.yaml
@@ -19,14 +19,11 @@
     project-name: redfish
     project: redfish
     build-node: centos7-builder-2c-1g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     mvn-settings: redfish-settings
     group-id: org.akraino.redfish
     refspec: refs/heads/master
+    branch: master
     jobs:
       - akraino-project-stream-release-config
       - akraino-project-stream-stage-config

diff --git a/jjb/regional_controller/regional_controller.yaml b/jjb/regional_controller/regional_controller.yaml
index 0d3c380..0af64fe 100644 (file)
--- a/jjb/regional_controller/regional_controller.yaml
+++ b/jjb/regional_controller/regional_controller.yaml
@@ -19,14 +19,11 @@
     project-name: regional_controller
     project: regional_controller
     build-node: centos7-builder-2c-1g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     mvn-settings: regional_controller-settings
     group-id: org.akraino.regional_controller
     refspec: refs/heads/master
+    branch: master
     jobs:
       - akraino-project-stream-release-config
       - akraino-project-stream-stage-config

diff --git a/jjb/sample_vnf/sample_vnf.yaml b/jjb/sample_vnf/sample_vnf.yaml
index 41107cf..0a1c6f2 100644 (file)
--- a/jjb/sample_vnf/sample_vnf.yaml
+++ b/jjb/sample_vnf/sample_vnf.yaml
@@ -19,14 +19,11 @@
     project-name: sample_vnf
     project: sample_vnf
     build-node: centos7-builder-2c-1g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     mvn-settings: sample_vnf-settings
     group-id: org.akraino.sample_vnf
     refspec: refs/heads/master
+    branch: master
     jobs:
       - akraino-project-stream-release-config
       - akraino-project-stream-stage-config

diff --git a/jjb/test_automation/test_automation.yaml b/jjb/test_automation/test_automation.yaml
index de6efa7..4af601b 100644 (file)
--- a/jjb/test_automation/test_automation.yaml
+++ b/jjb/test_automation/test_automation.yaml
@@ -19,14 +19,11 @@
     project-name: test_automation
     project: test_automation
     build-node: centos7-builder-2c-1g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     mvn-settings: test_automation-settings
     group-id: org.akraino.test_automation
     refspec: refs/heads/master
+    branch: master
     jobs:
       - akraino-project-stream-release-config
       - akraino-project-stream-stage-config

diff --git a/jjb/yaml_builds/yaml_builds.yaml b/jjb/yaml_builds/yaml_builds.yaml
index 0d49ba1..9dbad86 100644 (file)
--- a/jjb/yaml_builds/yaml_builds.yaml
+++ b/jjb/yaml_builds/yaml_builds.yaml
@@ -19,14 +19,11 @@
     project-name: yaml_builds
     project: yaml_builds
     build-node: centos7-builder-2c-1g
-    stream:
-      - master:
-          branch: master
-      - development:
-          branch: development
+    stream: master
     mvn-settings: yaml_builds-settings
     group-id: org.akraino.yaml_builds
     refspec: refs/heads/master
+    branch: master
     jobs:
       - akraino-project-stream-release-config
       - akraino-project-stream-stage-config