Merge "Add release job for aaf/cadi"
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/apps.yaml b/jjb/ccsdk/apps.yaml
index cd7cb95..0883258 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -29,8 +29,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-apps-settings'
@@ -75,8 +75,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
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 fcb1289..46e2558 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -14,3 +14,17 @@
trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
robot-options: ''
branch: 'master'
+
+- project:
+ name: ccsdk-oran-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'ccsdk-oran'
+ recipients: 'bjorn.magnusson@est.tech maxime.bonneau@est.tech'
+ stream: 'master'
+ functionality:
+ - 'polmansuite':
+ trigger_jobs: '{project-name}-maven-docker-stage-master'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index f154f4a..e80ecb1 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -10,7 +10,6 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
mvn-opts: '-Ddocker.skip=true'
- maven-versions-plugin: true
cron: ''
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index f466a16..54dbe98 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -29,6 +29,8 @@
branch: 'elalto'
- 'frankfurt':
branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-cds-settings'
@@ -73,8 +75,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-cds-settings'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 5e7fe59..a644435 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -24,10 +24,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-distribution-settings'
@@ -67,8 +65,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-distribution-settings'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 97e0f6b..eb9e830 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-features-settings'
@@ -64,8 +64,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-features-settings'
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 3fed58c..24cf739 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -19,8 +19,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-parent-settings'
@@ -42,8 +42,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-parent-settings'
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index d886f0a..bd553e1 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
@@ -21,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-adaptors-settings'
@@ -67,8 +63,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-adaptors-settings'
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index d549de9..658a92c 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
@@ -21,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-core-settings'
@@ -67,8 +63,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-core-settings'
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 70f32ef..a66c774 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
@@ -21,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-northbound-settings'
@@ -67,8 +63,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-northbound-settings'
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 36f1c7d..4433bb3 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
@@ -21,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-plugins-settings'
@@ -67,8 +63,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-plugins-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 221e0f5..f6859a3 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -23,8 +23,10 @@
# build docker image
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- - gerrit-release-verify
- - gerrit-release-merge
+ - gerrit-release-verify:
+ build-node: centos7-docker-8c-8g
+ - gerrit-release-merge:
+ build-node: centos7-docker-8c-8g
stream:
- master:
branch: master
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 10b0437..a6d3695 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -31,6 +31,22 @@
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'
+
+- parameter:
+ name: integration-terragrunt-version
+ parameters:
+ - string:
+ name: TERRAGRUNT_VERSION
+ default: '{terragrunt-version}'
+ description: 'Terragrunt version to install on minion'
+
- builder:
name: integration-install-robotframework
builders:
@@ -69,6 +85,30 @@
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-install-terragrunt
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -ex
+ cd /tmp
+ wget -q https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64
+ sudo mv terragrunt_linux_amd64 /usr/local/bin/terragrunt
+ sudo chmod +x /usr/local/bin/terragrunt
+ terragrunt --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..77be42b 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -104,3 +104,33 @@
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
+ terragrunt-version: 0.24.1
+ 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}'
+ - integration-terragrunt-version:
+ terragrunt-version: '{terragrunt-version}'
+
+ builders:
+ - integration-install-terraform
+ - integration-install-terragrunt
+ - 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..2a7fc5d 100644
--- a/jjb/integration/integration-terraform.yaml
+++ b/jjb/integration/integration-terraform.yaml
@@ -6,3 +6,22 @@
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: 'openlab/**'
+ - 'terragrunt':
+ tox-dir: 'terragrunt'
+ tox-envs: 'terragrunt'
+ pattern: 'terragrunt/**'
+ 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/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index dca6674..32c9333 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -24,8 +24,8 @@
stream:
- 'master':
branch: 'master'
- - 'release-3.2.0':
- branch: 'release-3.2.0'
+ - 'release-3.3.0':
+ branch: 'release-3.3.0'
mvn-settings: 'portal-sdk-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index c364608..22fa481 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -35,6 +35,7 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+ java-version: openjdk11
- gerrit-maven-stage:
build-timeout: 90
sign-artifacts: true
@@ -57,6 +58,7 @@
- 'frankfurt':
branch: 'frankfurt'
mvn-settings: 'sdc-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-docker-8c-8g
@@ -96,7 +98,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 +109,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 +141,4 @@
mvn-clean-install: true
project: 'sdc'
branch: master
+ java-version: openjdk11
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 0ef4363..d3cc5fe 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -30,8 +30,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
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 a35908a..95b1f90 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
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 fb8b054..e0cc013 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -26,10 +26,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: "mvn36"
mvn-settings: 'sdnc-oam-settings'
diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml
deleted file mode 100644
index ae86ef5..0000000
--- a/jjb/sdnc/sdnc-oom.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- project:
- name: sdnc-oom
- helm-module: 'sdnc'
- project-name: 'sdnc-oom'
- project: 'sdnc/oom'
- jobs:
- - '{project-name}-{stream}-verify-external-helm'
- - '{project-name}-{stream}-merge-external-helm':
- build_script: '{oom_build_script}'
- post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
- files: '**'
- stream:
- - 'master':
- branch: 'master'
-
- mvn-settings: 'sdnc-oom-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-helm-2c-1g
- pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
- oom_build_script: |
- #!/bin/bash
- set -e -o pipefail
- cd kubernetes/
- make all
- build_script: |
- #!/bin/bash
- cd kubernetes/
- make common
- make {helm-module}
- oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-
-- project:
- name: sdnc-oom-info
- project-name: sdnc-oom
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: sdnc/oom
- branch: master