Merge "Enable ToscaPOC branch"
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 46e2558..59216ae 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -5,6 +5,7 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'ccsdk'
+ disabled: true
recipients: 'dtimoney@att.com'
stream:
- 'master':
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index ac15e76..aee9a76 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -64,3 +64,18 @@
mvn-settings: 'ccsdk-oran-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: ccsdk-oran-rtd
+ project-name: 'ccsdk-oran'
+ jobs:
+ - '{project-name}-rtd-jobs'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
+ project: 'ccsdk/oran'
+ project-pattern: ccsdk/oran
+ rtd-build-url: https://readthedocs.org/api/v2/webhook/onap-ccsdk-oran/133602/
+ rtd-token: 7346b9ecd6195ab86db1fcadd29662512edc86e1
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 54dbe98..5882f0a 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -3,16 +3,17 @@
name: ccsdk-cds
project-name: 'ccsdk-cds'
jobs:
- - gerrit-maven-verify
+ - gerrit-maven-verify:
+ mvn-params: '-Ddocker.skip.push=true -P docker'
- gerrit-maven-merge:
cron: '@daily'
+ mvn-params: '-Ddocker.skip.push=true -P docker'
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
- maven-versions-plugin: true
+ mvn-params: '-Dmaven.test.skip=true'
cron: ''
- 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-params: '-Dmaven.test.skip=true -P docker'
@@ -41,7 +42,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
+ build-node: ubuntu1804-docker-8c-8g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -82,7 +83,6 @@
mvn-settings: 'ccsdk-cds-settings'
build-node: ubuntu1804-builder-4c-4g
-
- project:
name: ccsdk-cds-info
project-name: ccsdk-cds
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
index de506f8..0f061b9 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
@@ -22,6 +22,7 @@
stream:
- 'master':
branch: 'master'
+ java-version: openjdk11
- 'frankfurt':
branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-settings'
@@ -30,3 +31,23 @@
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+ name: dcaegen2-platform-mod-bpgenerator-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: 'dcaegen2/platform'
+ project-name: 'dcaegen2-platform-mod-bpgenerator'
+ branch: 'master'
+ mvn-settings: 'dcaegen2-platform-settings'
+ mvn-params: '-f mod/bpgenerator/pom.xml'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
index 5a5115b..66378f8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
@@ -17,6 +17,9 @@
branch: 'master'
java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
+ maven-version: 'mvn35'
+ maven-deploy-properties: |
+ deployAtEnd=true
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
index b0f256e..be62099 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
@@ -17,6 +17,9 @@
branch: 'master'
java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
+ maven-version: 'mvn35'
+ maven-deploy-properties: |
+ deployAtEnd=true
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
index 163dfa4..274d7e5 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
@@ -17,6 +17,9 @@
branch: 'master'
java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
+ maven-version: 'mvn35'
+ maven-deploy-properties: |
+ deployAtEnd=true
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
index 64471cc..3d8ea65 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
@@ -17,6 +17,9 @@
branch: 'master'
java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
+ maven-version: 'mvn35'
+ maven-deploy-properties: |
+ deployAtEnd=true
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 55c5e90..fb0a334 100755
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -7,8 +7,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
+ java-version: openjdk11
# apply to all jobs
project: 'dcaegen2/services/pm-mapper'
mvn-settings: 'dcaegen2-services-pm-mapper-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 4d07ea6..b0d5f99 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -38,6 +38,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImageTag'
+ mvn-params: '-f components/slice-analysis-ms/pom.xml'
pattern: 'components/slice-analysis-ms/**'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index d88fe02..6296ff1 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -21,14 +21,15 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'integration-settings'
- build-node: 'centos7-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
subproject:
- 'test-vcpe':
path: 'test/vcpe'
pattern: 'test/vcpe/**'
+ - 'ran-nssmf-simulator':
+ path: 'test/mocks/ran-nssmf-simulator'
+ pattern: 'test/mocks/ran-nssmf-simulator/**'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 895854a..aea005d 100644
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -1,5 +1,31 @@
---
- project:
+ name: integration-simulators-ran-simulator
+ project-name: integration-simulators-ran-simulator
+ stream:
+ - 'master':
+ branch: 'master'
+ project: 'integration/simulators/ran-simulator'
+ mvn-settings: 'integration-simulators-ran-simulator-settings'
+ files: '**'
+ maven-deploy-properties: |
+ deployAtEnd=true
+ archive-artifacts: ''
+ build-node: ubuntu1804-docker-8c-8g
+ jobs:
+ - '{project-name}-{stream}-verify-java':
+ mvn-goals: 'clean install'
+ - '{project-name}-{stream}-merge-java':
+ mvn-goals: 'clean deploy'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: 'clean deploy'
+
+- project:
name: integration-simulators-ran-simulator-info
project-name: integration-simulators-ran-simulator
jobs:
diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml
index 62d07a7..fac5181 100644
--- a/jjb/lf-infra-releasedockerhub.yaml
+++ b/jjb/lf-infra-releasedockerhub.yaml
@@ -16,9 +16,9 @@
disable-job: false
disabled: '{disable-job}'
- # Runs once a week
+ # Runs once a day
triggers:
- - timed: '@weekly'
+ - timed: '@daily'
# Define needed parameters for lf-infra-docker-login
parameters:
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index da9827b..d610663 100644
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -12,8 +12,8 @@
pom: 'azure/pom.xml'
pattern: 'azure/**'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+# - '{project-name}-{stream}-verify-java'
+# - '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- gerrit-maven-stage:
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index a3a0d60..ff4a3f8 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -12,7 +12,7 @@
- "certservice":
trigger_jobs:
- "oom-platform-cert-service-{stream}-merge-java"
- - "truststoremerger":
+ - "postprocessor":
trigger_jobs:
- "oom-platform-cert-service-{stream}-merge-java"
robot-options: ""
diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml
new file mode 100644
index 0000000..bb0b2dd
--- /dev/null
+++ b/jjb/oom/oom-consul.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: oom-consul-project-view
+ project-name: oom-consul
+ views:
+ - project-view
+
+- project:
+ name: oom-consul-info
+ project: oom/consul
+ project-name: oom-consul
+ build-node: centos7-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 325d79a..cb6bc9e 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -21,8 +21,8 @@
stream:
- 'master':
branch: 'master'
- - 'release-3.2.0':
- branch: 'release-3.2.0'
+ - 'guilin':
+ branch: 'guilin'
mvn-settings: 'portal-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index fe8d56c..4eb6804 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -5,6 +5,7 @@
- '{project-name}-{stream}-verify-csit-{functionality}-testng'
- '{project-name}-{stream}-csit-{functionality}-testng'
project-name: 'sdc'
+ disabled: true
recipients: 'ofir.sonsino@intl.att.com'
stream:
- 'master':