Merge "Fix typo on deployment job"
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 1397a65..8b267fd 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -32,6 +32,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-apps-settings'
@@ -78,6 +80,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-apps-settings'
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 9585cfa..80ec2bd 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -35,6 +35,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
mvn-settings: 'ccsdk-oran-settings'
robot-options: ''
branch: 'master'
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 27d146c..863dedf 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -26,6 +26,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-oran-settings'
@@ -49,6 +51,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-oran-settings'
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 25591f8..becb461 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -28,6 +28,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-cds-settings'
@@ -113,6 +115,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-cds-settings'
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 6447d1a..cc87b88 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -23,6 +23,8 @@
stream:
- 'master':
branch: 'master'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-dashboard-settings'
@@ -67,6 +69,8 @@
stream:
- 'master':
branch: 'master'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-dashboard-settings'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index ba20563..a071890 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -27,6 +27,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-distribution-settings'
@@ -68,6 +70,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-distribution-settings'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index eb9e830..dafafb3 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -19,6 +19,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-features-settings'
@@ -66,6 +68,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-features-settings'
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 24cf739..b9de56d 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -21,6 +21,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-parent-settings'
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 0b405db..299a415 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -19,6 +19,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-settings'
@@ -65,6 +67,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-settings'
diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
new file mode 100644
index 0000000..b523801
--- /dev/null
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -0,0 +1,66 @@
+---
+- project:
+ name: integration-simulators-nf-simulator-ves-client
+ project-name: 'integration-simulators-nf-simulator-ves-client'
+ java-version: openjdk11
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-docker-8c-8g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-goals: 'clean install -P docker'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+
+ project: 'integration/simulators/nf-simulator/ves-client'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'integration-simulators-nf-simulator-ves-client-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: ''
+ build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+ name: integration-simulators-nf-simulator-ves-client-sonar
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: '{sonar_mvn_goal}'
+ cron: '@daily'
+ build-node: ubuntu1804-docker-8c-8g
+ project: 'integration/simulators/nf-simulator/ves-client'
+ project-name: 'integration-simulators-nf-simulator-ves-client'
+ branch: 'master'
+ mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: integration-simulators-nf-simulator-ves-client-view
+ project-name: integration-simulators-nf-simulator-ves-client
+ views:
+ - project-view
+
+- project:
+ name: integration-simulators-nf-simulator-ves-client-info
+ project: integration/simulators/nf-simulator/ves-client
+ project-name: integration-simulators-nf-simulator-ves-client
+ build-node: centos7-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 8b1bcc8..d573f21 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,4 +1,19 @@
- project:
+ name: policy-drools-applications-project-csit
+ jobs:
+ - '{project-name}-{stream}-project-csit-{functionality}'
+ project-name: 'policy-drools-applications'
+ recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
+ project: 'policy/docker'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'drools-applications'
+ trigger_jobs:
+ - 'policy-drools-applications-{stream}-merge-java'
+
+- project:
name: policy-drools-pdp-project-csit
jobs:
- '{project-name}-{stream}-project-csit-{functionality}'
@@ -182,8 +197,6 @@
project-name: 'policy'
java-version: openjdk11
stream:
- - 'master':
- branch: master
- 'frankfurt':
branch: frankfurt
- 'guilin':
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 21a9155..fe6d0c1 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -32,6 +32,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version : "mvn36"
mvn-settings: 'sdnc-apps-settings'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 95b1f90..ac7b637 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -19,6 +19,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: "mvn36"
mvn-settings: 'sdnc-northbound-settings'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index e0cc013..391ee0e 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -28,6 +28,8 @@
branch: 'master'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
java-version: openjdk11
mvn-version: "mvn36"
mvn-settings: 'sdnc-oam-settings'