summaryrefslogtreecommitdiffstats
path: root/jjb/sdc
diff options
context:
space:
mode:
authorAndrew Grimberg <agrimberg@linuxfoundation.org>2023-05-03 09:09:44 -0700
committerAndrew Grimberg <agrimberg@linuxfoundation.org>2023-05-03 09:44:57 -0700
commit7a41136cc9d5758dfe40dd211fd0d32e9fccb4fc (patch)
tree9c77bd9bd93975f958b34865220813b127cd6e60 /jjb/sdc
parent485e5ac4922b0131dfdee4cc5aa96e88bcc2eb63 (diff)
Refactor: Cleanup for pre-commit
Change-Id: Id06f3d86219ab8df9a9498692f94b4511a2ebbc0 Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Diffstat (limited to 'jjb/sdc')
-rw-r--r--jjb/sdc/sdc-csit.yaml59
-rw-r--r--jjb/sdc/sdc-onap-ui-angular.yaml56
-rw-r--r--jjb/sdc/sdc-onap-ui-common.yaml56
-rw-r--r--jjb/sdc/sdc-sdc-be-common.yaml62
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml84
-rw-r--r--jjb/sdc/sdc-sdc-helm-validator-csit.yaml28
-rw-r--r--jjb/sdc/sdc-sdc-helm-validator.yaml63
-rw-r--r--jjb/sdc/sdc-sdc-pubsub.yaml56
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml62
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml70
-rw-r--r--jjb/sdc/sdc.yaml107
11 files changed, 352 insertions, 351 deletions
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index da54f3931..2fd7e9bef 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -1,31 +1,32 @@
---
- project:
- name: sdc-csit
- jobs:
- - '{project-name}-{stream}-verify-java':
- # this build is integration test only - CSIT (Verify 2/2)
- mvn-goals: clean install
- mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only,integration-tests-with-helm-validator'
- build-node: 'ubuntu1804-docker-8c-16g'
- archive-artifacts: >
- **/*.log
- **/hs_err_*.log
- **/target/**/feature.xml
- **/target/failsafe-reports/failsafe-summary.xml
- integration-tests/target/ExtentReport/API/*.html
- integration-tests/target/ExtentReport/UI/*.html
- integration-tests/target/ExtentReport/UI/screenshots/*.png
- project-name: 'sdc-integration-tests'
- # project name in gerrit
- project: 'sdc'
- stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- maven-version: 'mvn36'
- mvn-settings: 'sdc-settings'
- mvn-global-settings: global-settings
+ name: sdc-csit
+ jobs:
+ - "{project-name}-{stream}-verify-java":
+ # this build is integration test only - CSIT (Verify 2/2)
+ mvn-goals: clean install
+ # yamllint disable-line rule:line-length
+ mvn-params: "-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only,integration-tests-with-helm-validator"
+ build-node: "ubuntu1804-docker-8c-16g"
+ archive-artifacts: >
+ **/*.log
+ **/hs_err_*.log
+ **/target/**/feature.xml
+ **/target/failsafe-reports/failsafe-summary.xml
+ integration-tests/target/ExtentReport/API/*.html
+ integration-tests/target/ExtentReport/UI/*.html
+ integration-tests/target/ExtentReport/UI/screenshots/*.png
+ project-name: "sdc-integration-tests"
+ # project name in gerrit
+ project: "sdc"
+ stream:
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
+ maven-version: "mvn36"
+ mvn-settings: "sdc-settings"
+ mvn-global-settings: global-settings
diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
index 77a92408f..c270ee335 100644
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -7,47 +7,47 @@
- project:
name: sdc-onap-ui-angular-info
- project-name: 'sdc-onap-ui-angular'
+ project-name: "sdc-onap-ui-angular"
jobs:
- gerrit-info-yaml-verify
build-node: centos8-builder-2c-1g
- project: 'sdc/onap-ui-angular'
- branch: 'master'
+ project: "sdc/onap-ui-angular"
+ branch: "master"
- project:
name: sdc-onap-ui-angular
- project-name: 'sdc-onap-ui-angular'
+ project-name: "sdc-onap-ui-angular"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- project: 'sdc/onap-ui-angular'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ project: "sdc/onap-ui-angular"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-onap-ui-angular-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-onap-ui-angular-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-onap-ui-angular-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/onap-ui-angular'
- project-name: 'sdc-onap-ui-angular'
- branch: 'master'
- mvn-settings: 'sdc-onap-ui-angular-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/onap-ui-angular"
+ project-name: "sdc-onap-ui-angular"
+ branch: "master"
+ mvn-settings: "sdc-onap-ui-angular-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index 4770759b9..286557ec7 100644
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -1,47 +1,47 @@
---
- project:
name: sdc-onap-ui-common-info
- project-name: 'sdc-onap-ui-common'
+ project-name: "sdc-onap-ui-common"
jobs:
- gerrit-info-yaml-verify
build-node: centos8-builder-2c-1g
- project: 'sdc/onap-ui-common'
- branch: 'master'
+ project: "sdc/onap-ui-common"
+ branch: "master"
- project:
name: sdc-onap-ui-common
- project-name: 'sdc-onap-ui-common'
+ project-name: "sdc-onap-ui-common"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- project: 'sdc/onap-ui-common'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ project: "sdc/onap-ui-common"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-onap-ui-common-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-onap-ui-common-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-onap-ui-common-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/onap-ui-common'
- project-name: 'sdc-onap-ui-common'
- branch: 'master'
- mvn-settings: 'sdc-onap-ui-common-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/onap-ui-common"
+ project-name: "sdc-onap-ui-common"
+ branch: "master"
+ mvn-settings: "sdc-onap-ui-common-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index c3364e9bd..a2d474dd8 100644
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -7,60 +7,60 @@
- project:
name: sdc-sdc-be-common
- project-name: 'sdc-sdc-be-common'
+ project-name: "sdc-sdc-be-common"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
+ - "{project-name}-gerrit-release-jobs":
build-node: centos7-docker-2c-1g
- project: 'sdc/sdc-be-common'
+ project: "sdc/sdc-be-common"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-sdc-be-common-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-sdc-be-common-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-sdc-be-common-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/sdc-be-common'
- project-name: 'sdc-sdc-be-common'
- branch: 'master'
- mvn-settings: 'sdc-sdc-be-common-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/sdc-be-common"
+ project-name: "sdc-sdc-be-common"
+ branch: "master"
+ mvn-settings: "sdc-sdc-be-common-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
- project:
name: sdc-sdc-be-common-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdc/sdc-be-common
- project-name: 'sdc-sdc-be-common'
+ project-name: "sdc-sdc-be-common"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-sdc-be-common-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdc-sdc-be-common-settings"
- project:
name: sdc-sdc-be-common-info
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 699820a40..153511f51 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -7,85 +7,85 @@
- project:
name: sdc-sdc-distribution-client
- project-name: 'sdc-sdc-distribution-client'
+ project-name: "sdc-sdc-distribution-client"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
+ - "{project-name}-gerrit-release-jobs":
build-node: centos7-docker-2c-1g
- project: 'sdc/sdc-distribution-client'
+ project: "sdc/sdc-distribution-client"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'jakarta':
- branch: 'jakarta'
+ - "jakarta":
+ branch: "jakarta"
java-version: openjdk11
- - 'kohn':
- branch: 'kohn'
+ - "kohn":
+ branch: "kohn"
java-version: openjdk11
- mvn-settings: 'sdc-sdc-distribution-client-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "sdc-sdc-distribution-client-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-sdc-distribution-client-integration-pairwise
java-version: openjdk11
jobs:
- - '{project-name}-{stream}-integration-pairwise'
+ - "{project-name}-{stream}-integration-pairwise"
build-node: ubuntu1804-docker-8c-8g
- project: 'sdc/sdc-distribution-client'
- project-name: 'sdc-sdc-distribution-client'
+ project: "sdc/sdc-distribution-client"
+ project-name: "sdc-sdc-distribution-client"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
+ - "master":
+ branch: "master"
+ java-version: openjdk11
- mvn-settings: 'sdc-sdc-distribution-client-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "sdc-sdc-distribution-client-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
- mvn-params: ' -P integration-pairwise'
+ maven-version: "mvn36"
+ mvn-params: " -P integration-pairwise"
- project:
name: sdc-sdc-distribution-client-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/sdc-distribution-client'
- project-name: 'sdc-sdc-distribution-client'
- branch: 'master'
- mvn-settings: 'sdc-sdc-distribution-client-settings'
+ project: "sdc/sdc-distribution-client"
+ project-name: "sdc-sdc-distribution-client"
+ branch: "master"
+ mvn-settings: "sdc-sdc-distribution-client-settings"
java-version: openjdk11
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
- project:
name: sdc-sdc-distribution-client-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdc/sdc-distribution-client
- project-name: 'sdc-sdc-distribution-client'
+ project-name: "sdc-sdc-distribution-client"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-sdc-distribution-client-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdc-sdc-distribution-client-settings"
java-version: openjdk11
- project:
diff --git a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
index 64b6821ed..ea3cef139 100644
--- a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
@@ -1,16 +1,16 @@
---
- project:
- name: sdc-sdc-helm-validator-csit
- jobs:
- - "{project-name}-{stream}-verify-csit-{functionality}"
- - "{project-name}-{stream}-csit-{functionality}"
- project-name: "sdc"
- stream:
- - "master":
- branch: "master"
- - "kohn":
- branch: "kohn"
- functionality:
- - "sdc-helm-validator":
- trigger_jobs:
- robot-options: ""
+ name: sdc-sdc-helm-validator-csit
+ jobs:
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "sdc"
+ stream:
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ functionality:
+ - "sdc-helm-validator":
+ trigger_jobs:
+ robot-options: ""
diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml
index 66045fc4f..d55c0e24f 100644
--- a/jjb/sdc/sdc-sdc-helm-validator.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator.yaml
@@ -15,64 +15,63 @@
- project:
name: sdc-sdc-helm-validator
- project-name: 'sdc-sdc-helm-validator'
+ project-name: "sdc-sdc-helm-validator"
java-version: openjdk11
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- mvn-goals: 'clean deploy'
+ mvn-goals: "clean deploy"
- gerrit-maven-docker-stage:
sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-goals: 'clean install docker:build docker:push'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
+ mvn-goals: "clean install docker:build docker:push"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
build-node: centos7-docker-2c-1g
- project: 'sdc/sdc-helm-validator'
- mvn-settings: 'sdc-sdc-helm-validator-settings'
+ project: "sdc/sdc-helm-validator"
+ mvn-settings: "sdc-sdc-helm-validator-settings"
stream:
- - 'master':
- branch: 'master'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
-
- project:
name: sdc-sdc-helm-validator-sonar
java-version: openjdk11
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'sdc/sdc-helm-validator'
- project-name: 'sdc-sdc-helm-validator'
- branch: 'master'
- mvn-settings: 'sdc-sdc-helm-validator-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/sdc-helm-validator"
+ project-name: "sdc-sdc-helm-validator"
+ branch: "master"
+ mvn-settings: "sdc-sdc-helm-validator-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
- project:
name: sdc-sdc-helm-validator-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'sdc/sdc-helm-validator'
- project-name: 'sdc-sdc-helm-validator'
+ nexus-iq-namespace: "onap-"
+ project: "sdc/sdc-helm-validator"
+ project-name: "sdc-sdc-helm-validator"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-sdc-helm-validator-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdc-sdc-helm-validator-settings"
diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index d2d07dafb..cc838be19 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -1,47 +1,47 @@
---
- project:
name: sdc-sdc-pubsub-info
- project-name: 'sdc-sdc-pubsub'
+ project-name: "sdc-sdc-pubsub"
jobs:
- gerrit-info-yaml-verify
build-node: centos8-builder-2c-1g
- project: 'sdc/sdc-pubsub'
- branch: 'master'
+ project: "sdc/sdc-pubsub"
+ branch: "master"
- project:
name: sdc-sdc-pubsub
- project-name: 'sdc-sdc-pubsub'
+ project-name: "sdc-sdc-pubsub"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- project: 'sdc/sdc-pubsub'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ project: "sdc/sdc-pubsub"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-sdc-pubsub-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-sdc-pubsub-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-sdc-pubsub-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/sdc-pubsub'
- project-name: 'sdc-sdc-pubsub'
- branch: 'master'
- mvn-settings: 'sdc-sdc-pubsub-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/sdc-pubsub"
+ project-name: "sdc-sdc-pubsub"
+ branch: "master"
+ mvn-settings: "sdc-sdc-pubsub-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 7ac3ff908..ea7253c71 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -8,31 +8,31 @@
- project:
name: sdc-sdc-tosca
- project-name: 'sdc-sdc-tosca'
+ project-name: "sdc-sdc-tosca"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
+ - "{project-name}-gerrit-release-jobs":
build-node: centos7-docker-2c-1g
- project: 'sdc/sdc-tosca'
+ project: "sdc/sdc-tosca"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-sdc-tosca-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-sdc-tosca-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
java-version: openjdk11
- project:
@@ -40,31 +40,31 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/sdc-tosca'
- project-name: 'sdc-sdc-tosca'
- branch: 'master'
- mvn-settings: 'sdc-sdc-tosca-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/sdc-tosca"
+ project-name: "sdc-sdc-tosca"
+ branch: "master"
+ mvn-settings: "sdc-sdc-tosca-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
java-version: openjdk11
- project:
name: sdc-sdc-tosca-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdc/sdc-tosca
- project-name: 'sdc-sdc-tosca'
+ project-name: "sdc-sdc-tosca"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-sdc-tosca-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdc-sdc-tosca-settings"
java-version: openjdk11
- project:
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 378429606..12c00629b 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -8,10 +8,10 @@
- project:
name: sdc-sdc-workflow-designer
- project-name: 'sdc-sdc-workflow-designer'
+ project-name: "sdc-sdc-workflow-designer"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
@@ -21,60 +21,60 @@
sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
build-node: centos7-docker-2c-1g
java-version: openjdk11
- project: 'sdc/sdc-workflow-designer'
+ project: "sdc/sdc-workflow-designer"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-sdc-workflow-designer-settings'
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-sdc-workflow-designer-settings"
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
mvn-profile: docker
build-node: ubuntu1804-builder-4c-4g
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-sdc-workflow-designer-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/sdc-workflow-designer'
- project-name: 'sdc-sdc-workflow-designer'
- branch: 'master'
- mvn-settings: 'sdc-sdc-workflow-designer-settings'
- mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/sdc-workflow-designer"
+ project-name: "sdc-sdc-workflow-designer"
+ branch: "master"
+ mvn-settings: "sdc-sdc-workflow-designer-settings"
+ mvn-params: "-Djacoco.skip=false -Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
java-version: openjdk11
- project:
name: sdc-sdc-workflow-designer-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdc/sdc-workflow-designer
- project-name: 'sdc-sdc-workflow-designer'
+ project-name: "sdc-sdc-workflow-designer"
build-node: ubuntu1804-builder-4c-4g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-sdc-workflow-designer-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdc-sdc-workflow-designer-settings"
java-version: openjdk11
- project:
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 37984544d..05888332c 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -25,62 +25,63 @@
- project:
name: sdc
- project-name: 'sdc'
+ project-name: "sdc"
jobs:
- - '{project-name}-{stream}-verify-java':
+ - "{project-name}-{stream}-verify-java":
# this build is unit test only (Verify 1/2)
- mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
- build-node: 'ubuntu1804-docker-8c-8g'
- - '{project-name}-{stream}-sdc-merge-java':
- build-node: 'ubuntu1804-docker-8c-16g'
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator'
+ mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+ build-node: "ubuntu1804-docker-8c-8g"
+ - "{project-name}-{stream}-sdc-merge-java":
+ build-node: "ubuntu1804-docker-8c-16g"
+ docker-pom: "pom.xml"
+ mvn-profile: "docker"
+ # yamllint disable-line rule:line-length
+ mvn-params: "-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator"
# running everything (unit tests and integration tests in a single job for merge, as we don't need // run
# for merge, but still saving integration tests results and report.
archive-artifacts: >
- **/*.log
- **/hs_err_*.log
- **/target/**/feature.xml
- **/target/failsafe-reports/failsafe-summary.xml
- integration-tests/target/ExtentReport/API/*.html
- integration-tests/target/ExtentReport/UI/*.html
- integration-tests/target/ExtentReport/UI/screenshots/*.png
+ **/*.log
+ **/hs_err_*.log
+ **/target/**/feature.xml
+ **/target/failsafe-reports/failsafe-summary.xml
+ integration-tests/target/ExtentReport/API/*.html
+ integration-tests/target/ExtentReport/UI/*.html
+ integration-tests/target/ExtentReport/UI/screenshots/*.png
- gerrit-maven-stage:
build-timeout: 90
sign-artifacts: true
sbom-generator: true
build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-version: 'mvn36'
- mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
+ mvn-version: "mvn36"
+ mvn-params: "-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
- gerrit-maven-docker-stage:
sbom-generator: true
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
- mvn-version: 'mvn36'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
+ mvn-params: "-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+ mvn-version: "mvn36"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
build-node: centos7-docker-2c-1g
- project: 'sdc'
+ project: "sdc"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'jakarta':
- branch: 'jakarta'
+ - "jakarta":
+ branch: "jakarta"
java-version: openjdk11
- - 'kohn':
- branch: 'kohn'
+ - "kohn":
+ branch: "kohn"
java-version: openjdk11
- mvn-settings: 'sdc-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "sdc-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-sonar
@@ -88,20 +89,20 @@
- gerrit-maven-sonar:
build-timeout: 120
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-16g
- project: 'sdc'
- project-name: 'sdc'
- branch: 'master'
- mvn-settings: 'sdc-settings'
+ project: "sdc"
+ project-name: "sdc"
+ branch: "master"
+ mvn-settings: "sdc-settings"
java-version: openjdk11
- mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
- mvn-version: 'mvn36'
+ mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
+ mvn-version: "mvn36"
- project:
name: sdc-clm
@@ -109,16 +110,16 @@
- gerrit-maven-clm:
build-timeout: 120
submodule-timeout: 30
- mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
- nexus-iq-namespace: 'onap-'
+ mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+ nexus-iq-namespace: "onap-"
project: sdc
- project-name: 'sdc'
+ project-name: "sdc"
build-node: ubuntu1804-docker-8c-8g
stream:
- - 'master':
- branch: 'master'
- mvn-version: 'mvn36'
- mvn-settings: 'sdc-settings'
+ - "master":
+ branch: "master"
+ mvn-version: "mvn36"
+ mvn-settings: "sdc-settings"
java-version: openjdk11
- project: