summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------global-jjb0
-rw-r--r--jjb/ccsdk/ccsdk-csit.yaml13
-rw-r--r--jjb/ccsdk/ccsdk-oran.yaml1
-rw-r--r--jjb/ccsdk/sli-adaptors.yaml3
-rw-r--r--jjb/ccsdk/sli-core.yaml3
-rw-r--r--jjb/ccsdk/sli-northbound.yaml3
-rw-r--r--jjb/ccsdk/sli-plugins.yaml3
-rw-r--r--jjb/cli/cli.yaml8
-rw-r--r--jjb/integration/integration-docker.yaml28
-rw-r--r--jjb/integration/integration-macros.yaml20
-rw-r--r--jjb/integration/integration-templates.yaml26
-rw-r--r--jjb/integration/integration-terraform.yaml15
-rw-r--r--jjb/integration/simulators/integration-5G-core-nf-simulator.yaml37
-rw-r--r--jjb/sdc/sdc-microservices.yaml74
-rw-r--r--jjb/sdc/sdc-onap-ui-react.yaml44
15 files changed, 122 insertions, 156 deletions
diff --git a/global-jjb b/global-jjb
-Subproject cf8b441e368ad0ce9e8c2e0b8ddb7aad0d7d690
+Subproject 2399be2ca1402a7d1043089c3c57d623d9bfc06
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index fcb12894f..c0a2ff32b 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -14,3 +14,16 @@
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: 'oran'
+ stream: 'master'
+ functionality:
+ - 'polmansuite':
+ trigger_jobs:
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 971356d61..f154f4ab7 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -9,6 +9,7 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
+ mvn-opts: '-Ddocker.skip=true'
maven-versions-plugin: true
cron: ''
- gerrit-maven-docker-stage:
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 5b4d036d1..fbb72b2b2 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -10,9 +10,6 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
cron: ''
- - '{project-name}-maven-javadoc-jobs':
- 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 45c20a22e..da41efd2e 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -10,9 +10,6 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
cron: ''
- - '{project-name}-maven-javadoc-jobs':
- 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-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 1ffb3c938..d316ba992 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -9,9 +9,6 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
cron: ''
- - '{project-name}-maven-javadoc-jobs':
- 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-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index b1d55832d..4e71c49b5 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -10,9 +10,6 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
cron: ''
- - '{project-name}-maven-javadoc-jobs':
- 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/cli/cli.yaml b/jjb/cli/cli.yaml
index 4d1f3de26..89b94601d 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -31,8 +31,12 @@
build-node: ubuntu1804-docker-8c-8g
project: 'cli'
stream:
- - 'master':
- branch: 'master'
+ - 'master':
+ branch: 'master'
+ java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
+ java-version: openjdk8
mvn-settings: 'cli-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 410a02503..7858acefd 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -10,6 +10,10 @@
- 'master':
branch: 'master'
subproject:
+ - 'aai-simulator':
+ pom: 'test/mocks/aai-simulator/pom.xml'
+ pattern: 'test/mocks/aai-simulator/**'
+ mvn-goals: 'mvn clean install -Dcheckstyle.skip'
- 'sniroemulator':
pom: 'test/mocks/sniroemulator/pom.xml'
pattern: 'test/mocks/sniroemulator/**'
@@ -53,27 +57,3 @@
jobs:
- gerrit-docker-verify
- gerrit-docker-merge
-
-- project:
- name: integration-docker-aai-simulator
- project-name: 'integration'
- jobs:
- - integration-docker-merge
- - integration-docker-verify
- project: 'integration'
- stream:
- - 'master':
- branch: 'master'
- subproject:
- - 'aai-simulator':
- pom: 'test/mocks/aai-simulator/pom.xml'
- pattern: 'test/mocks/aai-simulator/**'
- mvn-goals: 'mvn clean install -Dcheckstyle.skip'
- post-docker-verify-script: |
- #!/bin/bash
- set -ex # Fail build if any setup step fails
- cd $WORKSPACE/test/mocks/aai-simulator
- tox
- mvn-settings: 'integration-settings'
- files: '**'
- archive-artifacts: ''
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 10b0437ab..89e83c268 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 622d523a7..42c069764 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 09b094ba9..015f4202c 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 000000000..f144dfa26
--- /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-microservices.yaml b/jjb/sdc/sdc-microservices.yaml
deleted file mode 100644
index 0aad2486a..000000000
--- a/jjb/sdc/sdc-microservices.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-- project:
- name: sdc-microservices-project-view
- project-name: sdc-microservices
- views:
- - project-view
-
-- project:
- name: sdc-microservices
- project-name: 'sdc-microservices'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-v1-8c-8g
- maven-versions-plugin: true
- mvn-params: '-DskipTests=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- subproject:
- - 'catalog-facade-ms':
- pom: 'catalog-facade-ms/pom.xml'
- pattern: 'catalog-facade-ms/**'
- project: 'sdc/microservices'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-microservices-settings'
- files: '**'
- archive-artifacts: ''
- build-timeout: 60
- maven-version: 'mvn35'
-
-- project:
- name: sdc-microservices-sonar
- 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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/microservices'
- project-name: 'sdc-microservices'
- branch: 'master'
- mvn-settings: 'sdc-microservices-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
-
-- project:
- name: sdc-microservices-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: sdc/microservices
- project-name: 'sdc-microservices'
- branch: 'master'
- mvn-settings: 'sdc-microservices-settings'
-
-- project:
- name: sdc-microservices-info
- project-name: sdc-microservices
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: sdc/microservices
- branch: master
diff --git a/jjb/sdc/sdc-onap-ui-react.yaml b/jjb/sdc/sdc-onap-ui-react.yaml
deleted file mode 100644
index 45b97928a..000000000
--- a/jjb/sdc/sdc-onap-ui-react.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
- name: sdc-onap-ui-react-info
- project-name: 'sdc-onap-ui-react'
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'sdc/onap-ui-react'
- branch: 'master'
-
-- project:
- name: sdc-onap-ui-react
- project-name: 'sdc-onap-ui-react'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- project: 'sdc/onap-ui-react'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-onap-ui-react-settings'
- files: '**'
- archive-artifacts: ''
- build-timeout: 60
- maven-version: 'mvn35'
-
-- project:
- name: sdc-onap-ui-react-sonar
- 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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/onap-ui-react'
- project-name: 'sdc-onap-ui-react'
- branch: 'master'
- mvn-settings: 'sdc-onap-ui-react-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'