From 86b6ca109d44cf9ce734bdfc049a611bc5b90a36 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Mon, 29 Apr 2019 10:41:12 -0400 Subject: [PATCH] Add CCSDK Dublin jobs Add Jenkins jobs for CCSDK Dublin branch. Also, added missing staging job for ccsdk/dashboard and removed filter from CCSDK tab to include staging jobs as well. Change-Id: I4ecacf7a645b316ff3504d0e2626dc4771a3eef9 Issue-ID: CIMAN-252 Signed-off-by: Timoney, Dan (dt5972) --- jjb/ccsdk/apps.yaml | 10 +++++++--- jjb/ccsdk/ccsdk-csit.yaml | 2 ++ jjb/ccsdk/cds.yaml | 6 ++++++ jjb/ccsdk/dashboard.yaml | 8 ++++++++ jjb/ccsdk/distribution.yaml | 6 ++++++ jjb/ccsdk/features.yaml | 4 ++++ jjb/ccsdk/parent.yaml | 4 ++++ jjb/ccsdk/platform-plugins.yaml | 4 ++++ jjb/ccsdk/sli-adaptors.yaml | 4 ++++ jjb/ccsdk/sli-core.yaml | 4 ++++ jjb/ccsdk/sli-northbound.yaml | 4 ++++ jjb/ccsdk/sli-plugins.yaml | 4 ++++ jjb/ccsdk/utils.yaml | 4 ++++ packer/common-packer | 2 +- 14 files changed, 62 insertions(+), 4 deletions(-) diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 704e242f8..9ee4277e5 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -3,9 +3,7 @@ name: ccsdk-project-view project-name: ccsdk views: - - common-view - view-name: ccsdk - view-regex: '(?!.*-maven-stage-)(ccsdk-.*)$' + - project-view - project: name: ccsdk-apps @@ -24,6 +22,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-apps-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 @@ -59,6 +59,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-apps-settings' build-node: ubuntu1604-builder-4c-4g @@ -74,6 +76,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-apps-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 2890a4e43..c97d1936b 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -10,6 +10,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 2ca06f5e9..421785491 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-cds-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 @@ -47,6 +49,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-cds-settings' build-node: ubuntu1604-builder-4c-4g @@ -60,6 +64,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-cds-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index bcac3f56f..c3f6d0e69 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -5,12 +5,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/dashboard' stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-dashboard-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 @@ -44,6 +48,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-dashboard-settings' build-node: centos7-redis-4c-4g @@ -57,6 +63,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-dashboard-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 9cb8dbfa9..ce8015e13 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -15,6 +15,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -34,6 +36,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -70,6 +74,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index bab31612a..3950c9869 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -16,6 +16,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-features-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 @@ -51,6 +53,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-features-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 33c7c23ee..c0d576b84 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -16,6 +16,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-parent-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 @@ -37,6 +39,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-parent-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index e7a251c89..b024a7a76 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -16,6 +16,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-platform-plugins-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 @@ -51,6 +53,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-platform-plugins-settings' build-node: centos7-redis-4c-4g diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 0e316b8ba..1b3237f98 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -16,6 +16,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-adaptors-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 @@ -51,6 +53,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-adaptors-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 4aa34cae1..a3feadd15 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -16,6 +16,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-core-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 @@ -51,6 +53,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-core-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index df87a7ff1..66c753b0b 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -16,6 +16,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-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 @@ -51,6 +53,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-northbound-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 63ce70dfd..290cb9b90 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -16,6 +16,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-plugins-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 @@ -50,6 +52,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-plugins-settings' diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 8129c4084..5c5e31633 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -16,6 +16,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-utils-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 @@ -37,6 +39,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-utils-settings' diff --git a/packer/common-packer b/packer/common-packer index 68cc818ab..ec0181407 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 68cc818abbb50411023d70149d97a52bba1d8456 +Subproject commit ec01814071eaea55ea7b025308b58d3923897eb6 -- 2.16.6