Merge "Changing the structure under plans/ccsdk"
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
index 5f1844a..fe7549c 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
@@ -1,4 +1,4 @@
IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181
LABELS=ubuntu1804-docker-8c-16g
HARDWARE_ID=v2-highcpu-16
-VOLUME_SIZE=20
+VOLUME_SIZE=40
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index d886f0a..fbb72b2 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -10,10 +10,6 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
cron: ''
- - '{project-name}-maven-javadoc-jobs':
- mvn-dir: ""
- mvn-site-id: ecomp-site
- javadoc-path: org.onap.$PROJECT/$STREAM
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index d549de9..da41efd 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -10,10 +10,6 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
cron: ''
- - '{project-name}-maven-javadoc-jobs':
- mvn-site-id: ecomp-site
- mvn-dir: ""
- javadoc-path: org.onap.$PROJECT/$STREAM
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 70f32ef..d316ba9 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -9,10 +9,6 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
cron: ''
- - '{project-name}-maven-javadoc-jobs':
- mvn-site-id: ecomp-site
- mvn-dir: ""
- javadoc-path: org.onap.$PROJECT/$STREAM
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 36f1c7d..4e71c49 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -10,10 +10,6 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
cron: ''
- - '{project-name}-maven-javadoc-jobs':
- mvn-site-id: ecomp-site
- mvn-dir: ""
- javadoc-path: org.onap.$PROJECT/$STREAM
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 10b0437..89e83c2 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -31,6 +31,14 @@
default: '{html-files}'
description: 'File name to be used by HTML publisher plugin to produce the report'
+- parameter:
+ name: integration-terraform-version
+ parameters:
+ - string:
+ name: TERRAFORM_VERSION
+ default: '{terraform-version}'
+ description: 'Terraform version to install on minion'
+
- builder:
name: integration-install-robotframework
builders:
@@ -69,6 +77,18 @@
mkdir -p ~/.ssh
- builder:
+ name: integration-install-terraform
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -ex
+ cd /tmp
+ wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+ unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+ sudo mv terraform /usr/local/bin/
+ terraform version
+
+- builder:
name: integration-docker-compose-logs
builders:
- shell: !include-raw: shell/docker-compose-logs.sh
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 622d523..42c0697 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -104,3 +104,29 @@
name: '{project-name}-{stream}-{subproject}-tox-verify'
id: integration-tox-verify
description: 'Job intended for running tox'
+
+- job-template:
+ <<: *tox_verify_boilerplate
+ name: '{project-name}-{stream}-{subproject}-terraform-verify'
+ terraform-version: 0.13.2
+ python-version: python3
+ id: integration-terraform-verify
+ description: 'Job intended for validating terraform modules'
+
+ parameters:
+ - lf-infra-parameters:
+ project: '{project}'
+ stream: '{stream}'
+ branch: '{branch}'
+ - lf-infra-tox-parameters:
+ tox-dir: '{tox-dir}'
+ tox-envs: '{tox-envs}'
+ - integration-terraform-version:
+ terraform-version: '{terraform-version}'
+
+ builders:
+ - integration-install-terraform
+ - lf-infra-tox-install:
+ python-version: '{python-version}'
+ - lf-infra-tox-run:
+ parallel: 'false'
diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml
index 09b094b..015f420 100644
--- a/jjb/integration/integration-terraform.yaml
+++ b/jjb/integration/integration-terraform.yaml
@@ -6,3 +6,18 @@
build-node: centos7-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
+
+- project:
+ name: integration-terraform-validate
+ project: integration/terraform
+ project-name: integration-terraform
+ jobs:
+ - integration-terraform-verify
+ subproject:
+ - 'openlab':
+ tox-dir: 'openlab'
+ tox-envs: 'terraform'
+ pattern: '**/*'
+ stream:
+ - 'master':
+ branch: 'master'
diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
new file mode 100644
index 0000000..f144dfa
--- /dev/null
+++ b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
@@ -0,0 +1,37 @@
+---
+- project:
+ name: integration-5G-core-nf-simulator-info
+ project-name: integration-5G-core-nf-simulator
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/simulators/5G-core-nf-simulator
+ branch: master
+
+- project:
+ name: integration-5G-core-nf-simulator-linters
+ project: integration/simulators/5G-core-nf-simulator
+ project-name: integration-5G-core-nf-simulator
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ - 'md':
+ tox-dir: '.'
+ tox-envs: 'md'
+ pattern: '**/*.md'
+ stream:
+ - 'master':
+ branch: 'master'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index c364608..c64d17e 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -57,6 +57,7 @@
- 'frankfurt':
branch: 'frankfurt'
mvn-settings: 'sdc-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-docker-8c-8g
@@ -96,7 +97,8 @@
project-name: 'sdc'
branch: 'master'
mvn-settings: 'sdc-settings'
- mvn-params: '-P docker -Dsonar.branch={branch} -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+ java-version: openjdk11
+ mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
@@ -106,13 +108,14 @@
- gerrit-maven-clm:
build-timeout: 120
submodule-timeout: 30
- mvn-params: '-P fast-build -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+ mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
nexus-iq-namespace: 'onap-'
project: sdc
project-name: 'sdc'
build-node: ubuntu1804-docker-8c-8g
branch: 'master'
mvn-settings: 'sdc-settings'
+ java-version: openjdk11
- project:
name: sdc-info
@@ -137,3 +140,4 @@
mvn-clean-install: true
project: 'sdc'
branch: master
+ java-version: openjdk11