From be959966c97a9d7317bacb4171ef50171cdb6109 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Tue, 30 Jun 2020 06:22:27 -0400 Subject: [PATCH] Drop branch parameter from release-job projects None of the maven, docker, packagecloud release job templates accepts a branch parameter, the jobs are triggered by any change in the [.]releases/ directory on any branch. Signed-off-by: Lott, Christopher (cl778h) Change-Id: I01dba6a4208a33b64e97e64e75aead02c6f8e7d1 --- jjb/it-otf/it-otf.yaml | 1 - jjb/it-test/it-test.yaml | 3 +-- jjb/nonrtric/nonrtric.yaml | 1 - jjb/o-du-l2/o-du-l2.yaml | 3 +-- jjb/oam-tr069-adapter/oam-tr069-adapter.yaml | 1 - jjb/ric-app-admin/ric-app-admin.yaml | 1 - jjb/ric-app-kpimon/ric-app-kpimon.yaml | 1 - jjb/ric-app-mc/ric-app-mc.yaml | 1 - jjb/ric-app-ml/ric-app-ml.yaml | 1 - jjb/ric-plt-a1/ric-plt-a1.yaml | 1 - jjb/ric-plt-appmgr/ric-plt-appmgr.yaml | 1 - jjb/ric-plt-dbaas/ric-plt-dbaas.yaml | 1 - jjb/ric-plt-e2/ric-plt-e2.yaml | 1 - jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml | 1 - jjb/ric-plt-o1/ric-plt-o1.yaml | 1 - .../ric-plt-resource-status-manager.yaml | 1 - jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml | 1 - jjb/ric-plt-submgr/ric-plt-submgr.yaml | 1 - jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml | 1 - jjb/sim-o1-interface/sim-o1-interface.yaml | 1 - 20 files changed, 2 insertions(+), 22 deletions(-) diff --git a/jjb/it-otf/it-otf.yaml b/jjb/it-otf/it-otf.yaml index 8b681f7f..db1c9b92 100644 --- a/jjb/it-otf/it-otf.yaml +++ b/jjb/it-otf/it-otf.yaml @@ -141,7 +141,6 @@ container-tag-method: yaml-file # maven settings file has docker credentials mvn-settings: it-otf-settings - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/it-test/it-test.yaml b/jjb/it-test/it-test.yaml index f45b7778..4d9fa571 100644 --- a/jjb/it-test/it-test.yaml +++ b/jjb/it-test/it-test.yaml @@ -71,9 +71,8 @@ - project: <<: *it_test_common name: it-test-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g jobs: - - '{project-name}-gerrit-release-jobs' \ No newline at end of file + - '{project-name}-gerrit-release-jobs' diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 165739aa..9746c9b4 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -81,7 +81,6 @@ - project: <<: *nonrtric_jdk_common name: nonrtric-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/o-du-l2/o-du-l2.yaml b/jjb/o-du-l2/o-du-l2.yaml index b1124861..a8a4aaad 100644 --- a/jjb/o-du-l2/o-du-l2.yaml +++ b/jjb/o-du-l2/o-du-l2.yaml @@ -56,9 +56,8 @@ - project: <<: *o_du_l2_common name: o-du-l2-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g jobs: - - '{project-name}-gerrit-release-jobs' \ No newline at end of file + - '{project-name}-gerrit-release-jobs' diff --git a/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml b/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml index ce4da6ff..dedb939d 100644 --- a/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml +++ b/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml @@ -51,7 +51,6 @@ - project: <<: *tr069-adapter-jdk08 name: tr069-adapter-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-app-admin/ric-app-admin.yaml b/jjb/ric-app-admin/ric-app-admin.yaml index 680be6de..dfbe4be0 100644 --- a/jjb/ric-app-admin/ric-app-admin.yaml +++ b/jjb/ric-app-admin/ric-app-admin.yaml @@ -41,7 +41,6 @@ - project: <<: *admin_docker_common name: ric-app-admin-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-app-kpimon/ric-app-kpimon.yaml b/jjb/ric-app-kpimon/ric-app-kpimon.yaml index 51f9ea8a..03bd74e4 100644 --- a/jjb/ric-app-kpimon/ric-app-kpimon.yaml +++ b/jjb/ric-app-kpimon/ric-app-kpimon.yaml @@ -41,7 +41,6 @@ - project: <<: *ric_app_kpimon_docker_common name: ric-app-kpimon-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-app-mc/ric-app-mc.yaml b/jjb/ric-app-mc/ric-app-mc.yaml index de57c8f7..22438670 100644 --- a/jjb/ric-app-mc/ric-app-mc.yaml +++ b/jjb/ric-app-mc/ric-app-mc.yaml @@ -69,7 +69,6 @@ <<: *mc_common name: ric-app-mc-release project-name: ric-app-mc - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-app-ml/ric-app-ml.yaml b/jjb/ric-app-ml/ric-app-ml.yaml index 0989c974..b6dce856 100644 --- a/jjb/ric-app-ml/ric-app-ml.yaml +++ b/jjb/ric-app-ml/ric-app-ml.yaml @@ -46,7 +46,6 @@ - project: <<: *ric_app_ml_docker_common name: ric-app-ml-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml index 7e04756e..81cf0432 100644 --- a/jjb/ric-plt-a1/ric-plt-a1.yaml +++ b/jjb/ric-plt-a1/ric-plt-a1.yaml @@ -96,7 +96,6 @@ - project: <<: *a1_common name: ric-plt-a1-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml index 7f834e2e..8aff3c6f 100644 --- a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml +++ b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml @@ -41,7 +41,6 @@ - project: <<: *appmgr_docker_common name: ric-plt-appmgr-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml index 06d4fced..cc525c4a 100644 --- a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml +++ b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml @@ -41,7 +41,6 @@ - project: <<: *dbaas_docker_common name: ric-plt-dbaas-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-plt-e2/ric-plt-e2.yaml b/jjb/ric-plt-e2/ric-plt-e2.yaml index 81e32cee..a7fdb80b 100644 --- a/jjb/ric-plt-e2/ric-plt-e2.yaml +++ b/jjb/ric-plt-e2/ric-plt-e2.yaml @@ -43,7 +43,6 @@ - project: <<: *e2_docker_common name: ric-plt-e2-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml index 872bbc2a..1288b594 100644 --- a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml +++ b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml @@ -43,7 +43,6 @@ - project: <<: *e2mgr_docker_common name: ric-plt-e2mgr-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-plt-o1/ric-plt-o1.yaml b/jjb/ric-plt-o1/ric-plt-o1.yaml index 6d555a25..853e8525 100644 --- a/jjb/ric-plt-o1/ric-plt-o1.yaml +++ b/jjb/ric-plt-o1/ric-plt-o1.yaml @@ -41,7 +41,6 @@ - project: <<: *o1_docker_common name: ric-plt-o1-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-plt-resource-status-manager/ric-plt-resource-status-manager.yaml b/jjb/ric-plt-resource-status-manager/ric-plt-resource-status-manager.yaml index 8bba9047..4136e0d7 100644 --- a/jjb/ric-plt-resource-status-manager/ric-plt-resource-status-manager.yaml +++ b/jjb/ric-plt-resource-status-manager/ric-plt-resource-status-manager.yaml @@ -43,7 +43,6 @@ - project: <<: *resource_status_manager_docker_common name: ric-plt-resource-status-manager-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml index 30fab682..d9589972 100644 --- a/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml +++ b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml @@ -41,7 +41,6 @@ - project: <<: *rtmgr_docker_common name: ric-plt-rtmgr-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-plt-submgr/ric-plt-submgr.yaml b/jjb/ric-plt-submgr/ric-plt-submgr.yaml index 9607501b..5ca703ae 100644 --- a/jjb/ric-plt-submgr/ric-plt-submgr.yaml +++ b/jjb/ric-plt-submgr/ric-plt-submgr.yaml @@ -41,7 +41,6 @@ - project: <<: *submgr_docker_common name: ric-plt-submgr-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml b/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml index 5282f988..f76407f6 100644 --- a/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml +++ b/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml @@ -41,7 +41,6 @@ - project: <<: *vespamgr_docker_common name: ric-plt-vespamgr-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g diff --git a/jjb/sim-o1-interface/sim-o1-interface.yaml b/jjb/sim-o1-interface/sim-o1-interface.yaml index 0885b29d..16c15e7c 100644 --- a/jjb/sim-o1-interface/sim-o1-interface.yaml +++ b/jjb/sim-o1-interface/sim-o1-interface.yaml @@ -99,7 +99,6 @@ - project: <<: *sim_o1_interface_docker name: sim-o1-interface-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g -- 2.16.6