summaryrefslogtreecommitdiffstats
path: root/jjb/integration/simulators
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/integration/simulators')
-rw-r--r--jjb/integration/simulators/integration-5G-core-nf-simulator.yaml80
-rw-r--r--jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml59
-rw-r--r--jjb/integration/simulators/integration-core-nssmf-simulator.yaml48
-rw-r--r--jjb/integration/simulators/integration-onap-components-simulators.yaml91
-rw-r--r--jjb/integration/simulators/integration-pnf-simulator.yaml188
-rw-r--r--jjb/integration/simulators/integration-ran-nssmf-simulator.yaml44
-rw-r--r--jjb/integration/simulators/integration-ran-simulator.yaml80
-rw-r--r--jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml112
-rw-r--r--jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml112
-rw-r--r--jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml29
-rw-r--r--jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml111
-rw-r--r--jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml70
-rw-r--r--jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml112
13 files changed, 567 insertions, 569 deletions
diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
index ed7c32e2b..527cead3e 100644
--- a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
+++ b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
@@ -13,27 +13,27 @@
project-name: integration-5G-core-nf-simulator
project: integration/simulators/5G-core-nf-simulator
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-5G-core-nf-simulator-settings'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-5G-core-nf-simulator-settings"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
subproject:
- - 'AMF':
- path: 'coresim/AMF/'
- pattern: 'coresim/AMF/**'
- pom: 'coresim/AMF/pom.xml'
- - 'SMF':
- path: 'coresim/SMF/'
- pattern: 'coresim/SMF/**'
- pom: 'coresim/SMF/pom.xml'
- - 'UPF':
- path: 'coresim/UPF/'
- pattern: 'coresim/UPF/**'
- pom: 'coresim/UPF/pom.xml'
+ - "AMF":
+ path: "coresim/AMF/"
+ pattern: "coresim/AMF/**"
+ pom: "coresim/AMF/pom.xml"
+ - "SMF":
+ path: "coresim/SMF/"
+ pattern: "coresim/SMF/**"
+ pom: "coresim/SMF/pom.xml"
+ - "UPF":
+ path: "coresim/UPF/"
+ pattern: "coresim/UPF/**"
+ pom: "coresim/UPF/pom.xml"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-java':
- mvn-goals: 'clean install'
+ - "{project-name}-{stream}-{subproject}-verify-java":
+ mvn-goals: "clean install"
- project:
name: integration-5G-core-nf-simulator-linters
@@ -43,26 +43,26 @@
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'
- - 'python':
- tox-dir: '.'
- tox-envs: 'py'
- pattern: '**/*.py'
+ - "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"
+ - "python":
+ tox-dir: "."
+ tox-envs: "py"
+ pattern: "**/*.py"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
index 17d3d9be2..7fe573362 100644
--- a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
+++ b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
@@ -1,5 +1,4 @@
---
-
- project:
name: integration-simulators-A1-policy-enforcement-simulator-info
project: integration/simulators/A1-policy-enforcement-simulator
@@ -14,15 +13,15 @@
project-name: integration-simulators-A1-policy-enforcement-simulator
java-version: openjdk11
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-A1-policy-enforcement-simulator-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-A1-policy-enforcement-simulator-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
jobs:
- - '{project-name}-{stream}-verify-java':
- mvn-goals: 'clean install'
+ - "{project-name}-{stream}-verify-java":
+ mvn-goals: "clean install"
- project:
name: integration-simulators-A1-policy-enforcement-simulator-linters
@@ -32,26 +31,26 @@
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'
- - 'python':
- tox-dir: '.'
- tox-envs: 'py'
- pattern: '**/*.py'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
+ - "yaml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yaml"
+ - "yml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yml"
+ - "json":
+ tox-dir: "."
+ tox-envs: "json"
+ pattern: "**/*.json"
+ - "python":
+ tox-dir: "."
+ tox-envs: "py"
+ pattern: "**/*.py"
+ - "md":
+ tox-dir: "."
+ tox-envs: "md"
+ pattern: "**/*.md"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
index 8130a6bdb..fe5d97ab5 100644
--- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
+++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
@@ -12,30 +12,30 @@
project: integration/simulators/core-nssmf-simulator
project-name: integration-simulators-core-nssmf-simulator
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-core-nssmf-simulator-settings'
- files: '**'
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-core-nssmf-simulator-settings"
+ files: "**"
maven-deploy-properties: |
- deployAtEnd=true
- archive-artifacts: ''
+ 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-2c-1g
- - gerrit-maven-docker-stage:
- build-node: centos8-docker-8c-8g
- maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean deploy'
- mvn-params: '-P docker'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos8-docker-8c-8g
- maven-versions-plugin: true
- mvn-goals: 'clean deploy'
+ - "{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-2c-1g
+ - gerrit-maven-docker-stage:
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean deploy"
+ mvn-params: "-P docker"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: "clean deploy"
diff --git a/jjb/integration/simulators/integration-onap-components-simulators.yaml b/jjb/integration/simulators/integration-onap-components-simulators.yaml
index 7c1f81807..dc82c3341 100644
--- a/jjb/integration/simulators/integration-onap-components-simulators.yaml
+++ b/jjb/integration/simulators/integration-onap-components-simulators.yaml
@@ -1,85 +1,86 @@
+---
- project:
- name: 'integration-onap-components-simulators-docker'
+ name: "integration-onap-components-simulators-docker"
jobs:
- gerrit-docker-verify:
- project-name: 'integration-onap-component-simulators-aai'
+ project-name: "integration-onap-component-simulators-aai"
docker-root: ./mock-aai
- docker-name: 'onap/onap-component-mock-aai'
+ docker-name: "onap/onap-component-mock-aai"
- gerrit-docker-merge:
- project-name: 'integration-onap-component-simulators-aai'
+ project-name: "integration-onap-component-simulators-aai"
docker-root: ./mock-aai
- docker-name: 'onap/onap-component-mock-aai'
+ docker-name: "onap/onap-component-mock-aai"
- gerrit-docker-verify:
- project-name: 'integration-onap-component-simulators-cds'
+ project-name: "integration-onap-component-simulators-cds"
docker-root: ./mock-cds
- docker-name: 'onap/onap-component-mock-cds'
+ docker-name: "onap/onap-component-mock-cds"
- gerrit-docker-merge:
- project-name: 'integration-onap-component-simulators-cds'
+ project-name: "integration-onap-component-simulators-cds"
docker-root: ./mock-cds
- docker-name: 'onap/onap-component-mock-cds'
+ docker-name: "onap/onap-component-mock-cds"
- gerrit-docker-verify:
- project-name: 'integration-onap-component-simulators-clamp'
+ project-name: "integration-onap-component-simulators-clamp"
docker-root: ./mock-clamp
- docker-name: 'onap/onap-component-mock-clamp'
+ docker-name: "onap/onap-component-mock-clamp"
- gerrit-docker-merge:
- project-name: 'integration-onap-component-simulators-clamp'
+ project-name: "integration-onap-component-simulators-clamp"
docker-root: ./mock-clamp
- docker-name: 'onap/onap-component-mock-clamp'
+ docker-name: "onap/onap-component-mock-clamp"
- gerrit-docker-verify:
- project-name: 'integration-onap-component-simulators-dmaap'
+ project-name: "integration-onap-component-simulators-dmaap"
docker-root: ./mock-dmaap
- docker-name: 'onap/onap-component-mock-dmaap'
+ docker-name: "onap/onap-component-mock-dmaap"
- gerrit-docker-merge:
- project-name: 'integration-onap-component-simulators-dmaap'
+ project-name: "integration-onap-component-simulators-dmaap"
docker-root: ./mock-dmaap
- docker-name: 'onap/onap-component-mock-dmaap'
+ docker-name: "onap/onap-component-mock-dmaap"
- gerrit-docker-verify:
- project-name: 'integration-onap-component-simulators-msb-k8s'
+ project-name: "integration-onap-component-simulators-msb-k8s"
docker-root: ./mock-msb-k8s
- docker-name: 'onap/onap-component-mock-k8s'
+ docker-name: "onap/onap-component-mock-k8s"
- gerrit-docker-merge:
- project-name: 'integration-onap-component-simulators-msb-k8s'
+ project-name: "integration-onap-component-simulators-msb-k8s"
docker-root: ./mock-msb-k8s
- docker-name: 'onap/onap-component-mock-k8s'
+ docker-name: "onap/onap-component-mock-k8s"
- gerrit-docker-verify:
- project-name: 'integration-onap-component-simulators-sdc'
+ project-name: "integration-onap-component-simulators-sdc"
docker-root: ./mock-sdc
- docker-name: 'onap/onap-component-mock-sdc'
+ docker-name: "onap/onap-component-mock-sdc"
- gerrit-docker-merge:
- project-name: 'integration-onap-component-simulators-sdc'
+ project-name: "integration-onap-component-simulators-sdc"
docker-root: ./mock-sdc
- docker-name: 'onap/onap-component-mock-sdc'
+ docker-name: "onap/onap-component-mock-sdc"
- gerrit-docker-verify:
- project-name: 'integration-onap-component-simulators-sdnc'
+ project-name: "integration-onap-component-simulators-sdnc"
docker-root: ./mock-sdnc
- docker-name: 'onap/onap-component-mock-sdnc'
+ docker-name: "onap/onap-component-mock-sdnc"
- gerrit-docker-merge:
- project-name: 'integration-onap-component-simulators-sdnc'
+ project-name: "integration-onap-component-simulators-sdnc"
docker-root: ./mock-sdnc
- docker-name: 'onap/onap-component-mock-sdnc'
+ docker-name: "onap/onap-component-mock-sdnc"
- gerrit-docker-verify:
- project-name: 'integration-onap-component-simulators-so'
+ project-name: "integration-onap-component-simulators-so"
docker-root: ./mock-so
- docker-name: 'onap/onap-component-mock-so'
+ docker-name: "onap/onap-component-mock-so"
- gerrit-docker-merge:
- project-name: 'integration-onap-component-simulators-so'
+ project-name: "integration-onap-component-simulators-so"
docker-root: ./mock-so
- docker-name: 'onap/onap-component-mock-so'
+ docker-name: "onap/onap-component-mock-so"
- gerrit-docker-verify:
- project-name: 'integration-onap-component-simulators-ves'
+ project-name: "integration-onap-component-simulators-ves"
docker-root: ./mock-ves
- docker-name: 'onap/onap-component-mock-ves'
+ docker-name: "onap/onap-component-mock-ves"
- gerrit-docker-merge:
- project-name: 'integration-onap-component-simulators-ves'
+ project-name: "integration-onap-component-simulators-ves"
docker-root: ./mock-ves
- docker-name: 'onap/onap-component-mock-ves'
- project: 'integration/onap-component-simulators'
+ docker-name: "onap/onap-component-mock-ves"
+ project: "integration/onap-component-simulators"
stream:
- - 'master':
- branch: 'master'
- files: ''
- docker-root: '$WORKSPACE'
- mvn-settings: 'integration-settings'
+ - "master":
+ branch: "master"
+ files: ""
+ docker-root: "$WORKSPACE"
+ mvn-settings: "integration-settings"
build-node: ubuntu1804-docker-8c-8g
- cron: '@daily'
- container-tag-method: stream \ No newline at end of file
+ cron: "@daily"
+ container-tag-method: stream
diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index b87757cfe..ff682a2c0 100644
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -1,105 +1,103 @@
---
- project:
- name: integration-simulators-pnf-simulator
- project-name: integration-pnf-simulator
- stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- project: 'integration/simulators/pnf-simulator'
- mvn-settings: 'integration-simulators-pnf-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 -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true'
- - '{project-name}-{stream}-merge-java':
- mvn-goals: 'clean deploy'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-2c-1g
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos8-docker-8c-8g
- maven-versions-plugin: true
- mvn-goals: 'clean deploy'
- - 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: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+ name: integration-simulators-pnf-simulator
+ project-name: integration-pnf-simulator
+ stream:
+ - "master":
+ branch: "master"
+ java-version: openjdk11
+ project: "integration/simulators/pnf-simulator"
+ mvn-settings: "integration-simulators-pnf-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 -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true"
+ - "{project-name}-{stream}-merge-java":
+ mvn-goals: "clean deploy"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: "clean deploy"
+ - 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: "-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false"
- project:
- name: integration-simulators-pnf-simulator-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'
- build-node: ubuntu1804-docker-8c-8g
- project: integration/simulators/pnf-simulator
- project-name: integration-pnf-simulator
- branch: 'master'
- mvn-settings: 'integration-simulators-pnf-simulator-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
+ name: integration-simulators-pnf-simulator-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"
+ build-node: ubuntu1804-docker-8c-8g
+ project: integration/simulators/pnf-simulator
+ project-name: integration-pnf-simulator
+ branch: "master"
+ mvn-settings: "integration-simulators-pnf-simulator-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-pnf-simulator-info
- project-name: integration-pnf-simulator
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos8-builder-2c-1g
- project: integration/simulators/pnf-simulator
- branch: master
+ name: integration-simulators-pnf-simulator-info
+ project-name: integration-pnf-simulator
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos8-builder-2c-1g
+ project: integration/simulators/pnf-simulator
+ branch: master
- project:
- name: integration-simulators-pnf-simulator-cli
- project: integration/simulators/pnf-simulator
- project-name: integration-pnf-simulator
- python-version: python3
- jobs:
- - integration-tox-verify
- subproject:
- - 'simulator-cli':
- tox-dir: 'simulator-cli'
- tox-envs: 'pytest'
- pattern: '**/*'
- stream:
- - 'master':
- branch: 'master'
+ name: integration-simulators-pnf-simulator-cli
+ project: integration/simulators/pnf-simulator
+ project-name: integration-pnf-simulator
+ python-version: python3
+ jobs:
+ - integration-tox-verify
+ subproject:
+ - "simulator-cli":
+ tox-dir: "simulator-cli"
+ tox-envs: "pytest"
+ pattern: "**/*"
+ stream:
+ - "master":
+ branch: "master"
- project:
- name: integration-simulators-pnf-simulator-linters
- project: integration/simulators/pnf-simulator
- project-name: integration-pnf-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'
- - 'python':
- tox-dir: '.'
- tox-envs: 'py'
- pattern: '**/*.py'
- stream:
- - 'master':
- branch: 'master'
-
+ name: integration-simulators-pnf-simulator-linters
+ project: integration/simulators/pnf-simulator
+ project-name: integration-pnf-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"
+ - "python":
+ tox-dir: "."
+ tox-envs: "py"
+ pattern: "**/*.py"
+ stream:
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml
index c9b93d9b4..83456d9ea 100644
--- a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml
@@ -21,26 +21,26 @@
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'
- - 'python':
- tox-dir: '.'
- tox-envs: 'py'
- pattern: '**/*.py'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
+ - "yaml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yaml"
+ - "yml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yml"
+ - "json":
+ tox-dir: "."
+ tox-envs: "json"
+ pattern: "**/*.json"
+ - "python":
+ tox-dir: "."
+ tox-envs: "py"
+ pattern: "**/*.py"
+ - "md":
+ tox-dir: "."
+ tox-envs: "md"
+ pattern: "**/*.md"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 2a9f75b35..c630a870f 100644
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -1,31 +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'
- maven-deploy-properties: |
- deployAtEnd=true
- archive-artifacts: ''
- build-node: ubuntu1804-docker-8c-8g
- jobs:
- - '{project-name}-{stream}-verify-java':
- mvn-goals: 'clean install'
- pattern: 'ransim/**'
- pom: 'ransim/pom.xml'
- - '{project-name}-{stream}-merge-java':
- mvn-goals: 'clean deploy'
- pom: 'ransim/pom.xml'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-2c-1g
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos8-docker-8c-8g
- maven-versions-plugin: true
- mvn-goals: 'clean deploy'
+ 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"
+ maven-deploy-properties: |
+ deployAtEnd=true
+ archive-artifacts: ""
+ build-node: ubuntu1804-docker-8c-8g
+ jobs:
+ - "{project-name}-{stream}-verify-java":
+ mvn-goals: "clean install"
+ pattern: "ransim/**"
+ pom: "ransim/pom.xml"
+ - "{project-name}-{stream}-merge-java":
+ mvn-goals: "clean deploy"
+ pom: "ransim/pom.xml"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: "clean deploy"
- project:
name: integration-simulators-ran-simulator-info
@@ -44,18 +44,18 @@
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'
+ - "yaml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yaml"
+ - "yml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yml"
+ - "json":
+ tox-dir: "."
+ tox-envs: "json"
+ pattern: "**/*.json"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
index 299ababfe..36a625e4e 100644
--- a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
@@ -1,65 +1,65 @@
---
- project:
- name: integration-simulators-nf-simulator-pm-https-server
- project-name: 'integration-simulators-nf-simulator-pm-https-server'
- java-version: openjdk11
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos8-docker-8c-8g
- maven-versions-plugin: true
- - 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-goals: 'clean install -P docker -DskipDockerPush=false'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-2c-1g
+ name: integration-simulators-nf-simulator-pm-https-server
+ project-name: "integration-simulators-nf-simulator-pm-https-server"
+ java-version: openjdk11
+ jobs:
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ - 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-goals: "clean install -P docker -DskipDockerPush=false"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'integration/simulators/nf-simulator/pm-https-server'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-settings'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ project: "integration/simulators/nf-simulator/pm-https-server"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-pm-https-server-settings"
+ # due to a strange macro / variable translation problem this needs
+ # to be passed as a string block to properly get the properties
+ # correctly defined in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
- name: integration-simulators-nf-simulator-pm-https-server-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'
- build-node: ubuntu1804-docker-8c-8g
- project: 'integration/simulators/nf-simulator/pm-https-server'
- project-name: 'integration-simulators-nf-simulator-pm-https-server'
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: integration-simulators-nf-simulator-pm-https-server-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"
+ build-node: ubuntu1804-docker-8c-8g
+ project: "integration/simulators/nf-simulator/pm-https-server"
+ project-name: "integration-simulators-nf-simulator-pm-https-server"
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-pm-https-server-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-nf-simulator-pm-https-server-view
- project-name: integration-simulators-nf-simulator-pm-https-server
- views:
- - project-view
+ name: integration-simulators-nf-simulator-pm-https-server-view
+ project-name: integration-simulators-nf-simulator-pm-https-server
+ views:
+ - project-view
- project:
- name: integration-simulators-nf-simulator-pm-https-server-info
- project: integration/simulators/nf-simulator/pm-https-server
- project-name: integration-simulators-nf-simulator-pm-https-server
- build-node: centos8-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
+ name: integration-simulators-nf-simulator-pm-https-server-info
+ project: integration/simulators/nf-simulator/pm-https-server
+ project-name: integration-simulators-nf-simulator-pm-https-server
+ build-node: centos8-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
index f242ec177..df86a28c0 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
@@ -1,65 +1,65 @@
---
- project:
- name: integration-simulators-nf-simulator-avcn-manager
- project-name: 'integration-simulators-nf-simulator-avcn-manager'
- java-version: openjdk11
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos8-docker-8c-8g
- maven-versions-plugin: true
- - 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-goals: 'clean deploy -P docker -DskipDockerPush=false'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-2c-1g
+ name: integration-simulators-nf-simulator-avcn-manager
+ project-name: "integration-simulators-nf-simulator-avcn-manager"
+ java-version: openjdk11
+ jobs:
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ - 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-goals: "clean deploy -P docker -DskipDockerPush=false"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'integration/simulators/nf-simulator/avcn-manager'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-avcn-manager-settings'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ project: "integration/simulators/nf-simulator/avcn-manager"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-avcn-manager-settings"
+ # due to a strange macro / variable translation problem this needs
+ # to be passed as a string block to properly get the properties
+ # correctly defined in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
- name: integration-simulators-nf-simulator-avcn-manager-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'
- build-node: ubuntu1804-docker-8c-8g
- project: 'integration/simulators/nf-simulator/avcn-manager'
- project-name: 'integration-simulators-nf-simulator-avcn-manager'
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-avcn-manager-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: integration-simulators-nf-simulator-avcn-manager-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"
+ build-node: ubuntu1804-docker-8c-8g
+ project: "integration/simulators/nf-simulator/avcn-manager"
+ project-name: "integration-simulators-nf-simulator-avcn-manager"
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-avcn-manager-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-nf-simulator-avcn-manager-view
- project-name: integration-simulators-nf-simulator-avcn-manager
- views:
- - project-view
+ name: integration-simulators-nf-simulator-avcn-manager-view
+ project-name: integration-simulators-nf-simulator-avcn-manager
+ views:
+ - project-view
- project:
- name: integration-simulators-nf-simulator-avcn-manager-info
- project: integration/simulators/nf-simulator/avcn-manager
- project-name: integration-simulators-nf-simulator-avcn-manager
- build-node: centos8-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
+ name: integration-simulators-nf-simulator-avcn-manager-info
+ project: integration/simulators/nf-simulator/avcn-manager
+ project-name: integration-simulators-nf-simulator-avcn-manager
+ build-node: centos8-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml
index 141639448..633796c11 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml
@@ -1,15 +1,16 @@
+---
- project:
- name: integration-simulators-nf-simulator-netconf-server-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'integration-simulators-nf-simulator-netconf-server'
- recipients: 'krzysztof.kuzmicki@nokia.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com'
- stream:
- - 'master':
- branch: 'master'
- functionality:
- - 'testsuites':
- trigger_jobs:
- - '{project-name}-{stream}-merge-java'
- robot-options: ''
+ name: integration-simulators-nf-simulator-netconf-server-csit
+ jobs:
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "integration-simulators-nf-simulator-netconf-server"
+ recipients: "krzysztof.kuzmicki@nokia.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com"
+ stream:
+ - "master":
+ branch: "master"
+ functionality:
+ - "testsuites":
+ trigger_jobs:
+ - "{project-name}-{stream}-merge-java"
+ robot-options: ""
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
index 8c21bb621..8c0039c51 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
@@ -1,65 +1,64 @@
---
-
- project:
- name: integration-simulators-nf-simulator-netconf-server
- project-name: 'integration-simulators-nf-simulator-netconf-server'
- python-version: python3.8
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos8-docker-8c-8g
- maven-versions-plugin: true
- - 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-goals: 'clean install -P docker -DskipDockerPush=false'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-2c-1g
+ name: integration-simulators-nf-simulator-netconf-server
+ project-name: "integration-simulators-nf-simulator-netconf-server"
+ python-version: python3.8
+ jobs:
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ - 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-goals: "clean install -P docker -DskipDockerPush=false"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'integration/simulators/nf-simulator/netconf-server'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ project: "integration/simulators/nf-simulator/netconf-server"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-netconf-server-settings"
+ # due to a strange macro / variable translation problem this needs
+ # to be passed as a string block to properly get the properties
+ # correctly defined in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
- name: integration-simulators-nf-simulator-netconf-server-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'
- build-node: ubuntu1804-docker-8c-8g
- project: 'integration/simulators/nf-simulator/netconf-server'
- project-name: 'integration-simulators-nf-simulator-netconf-server'
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: integration-simulators-nf-simulator-netconf-server-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"
+ build-node: ubuntu1804-docker-8c-8g
+ project: "integration/simulators/nf-simulator/netconf-server"
+ project-name: "integration-simulators-nf-simulator-netconf-server"
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-netconf-server-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-nf-simulator-netconf-server-view
- project-name: integration-simulators-nf-simulator-netconf-server
- views:
- - project-view
+ name: integration-simulators-nf-simulator-netconf-server-view
+ project-name: integration-simulators-nf-simulator-netconf-server
+ views:
+ - project-view
- project:
- name: integration-simulators-nf-simulator-netconf-server-info
- project: integration/simulators/nf-simulator/netconf-server
- project-name: integration-simulators-nf-simulator-netconf-server
- build-node: centos8-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
+ name: integration-simulators-nf-simulator-netconf-server-info
+ project: integration/simulators/nf-simulator/netconf-server
+ project-name: integration-simulators-nf-simulator-netconf-server
+ build-node: centos8-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
index ba4c331a2..af4f05a75 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
@@ -1,41 +1,41 @@
---
- project:
- name: integration-simulators-nf-simulator-simulator-cli
- project-name: 'integration-simulators-nf-simulator'
- python-version: python3
- tox-dir: '.'
- tox-envs: ''
- subproject:
- - simulator-cli:
- path: './simulator-cli'
- pattern: '**'
- project: 'integration/simulators/nf-simulator'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-settings'
- build-node: ubuntu1804-builder-4c-4g
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ name: integration-simulators-nf-simulator-simulator-cli
+ project-name: "integration-simulators-nf-simulator"
+ python-version: python3
+ tox-dir: "."
+ tox-envs: ""
+ subproject:
+ - simulator-cli:
+ path: "./simulator-cli"
+ pattern: "**"
+ project: "integration/simulators/nf-simulator"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-settings"
+ build-node: ubuntu1804-builder-4c-4g
+ jobs:
+ - "{project-name}-{stream}-{subproject}-verify-python"
- project:
- name: integration-simulators-nf-simulator-sonar
- jobs:
- - gerrit-tox-sonar
- cron: '@daily'
- build-node: ubuntu1804-builder-4c-4g
- project: 'integration/simulators/nf-simulator'
- project-name: 'integration-simulators-nf-simulator'
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: integration-simulators-nf-simulator-sonar
+ jobs:
+ - gerrit-tox-sonar
+ cron: "@daily"
+ build-node: ubuntu1804-builder-4c-4g
+ project: "integration/simulators/nf-simulator"
+ project-name: "integration-simulators-nf-simulator"
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-nf-simulator-info
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos8-builder-2c-1g
- project: 'integration/simulators/nf-simulator'
- project-name: 'integration-simulators-nf-simulator'
- branch: 'master'
+ name: integration-simulators-nf-simulator-info
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos8-builder-2c-1g
+ project: "integration/simulators/nf-simulator"
+ project-name: "integration-simulators-nf-simulator"
+ branch: "master"
diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
index 3492b1826..a8ad871ed 100644
--- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -1,65 +1,65 @@
---
- project:
- name: integration-simulators-nf-simulator-ves-client
- project-name: 'integration-simulators-nf-simulator-ves-client'
- java-version: openjdk11
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos8-docker-8c-8g
- maven-versions-plugin: true
- - 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-goals: 'clean deploy -P docker -DskipDockerPush=false'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-2c-1g
+ name: integration-simulators-nf-simulator-ves-client
+ project-name: "integration-simulators-nf-simulator-ves-client"
+ java-version: openjdk11
+ jobs:
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ - 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-goals: "clean deploy -P docker -DskipDockerPush=false"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'integration/simulators/nf-simulator/ves-client'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ project: "integration/simulators/nf-simulator/ves-client"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-ves-client-settings"
+ # due to a strange macro / variable translation problem this needs
+ # to be passed as a string block to properly get the properties
+ # correctly defined in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
- name: integration-simulators-nf-simulator-ves-client-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'
- build-node: ubuntu1804-docker-8c-8g
- project: 'integration/simulators/nf-simulator/ves-client'
- project-name: 'integration-simulators-nf-simulator-ves-client'
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: integration-simulators-nf-simulator-ves-client-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"
+ build-node: ubuntu1804-docker-8c-8g
+ project: "integration/simulators/nf-simulator/ves-client"
+ project-name: "integration-simulators-nf-simulator-ves-client"
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-ves-client-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-nf-simulator-ves-client-view
- project-name: integration-simulators-nf-simulator-ves-client
- views:
- - project-view
+ name: integration-simulators-nf-simulator-ves-client-view
+ project-name: integration-simulators-nf-simulator-ves-client
+ views:
+ - project-view
- project:
- name: integration-simulators-nf-simulator-ves-client-info
- project: integration/simulators/nf-simulator/ves-client
- project-name: integration-simulators-nf-simulator-ves-client
- build-node: centos8-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
+ name: integration-simulators-nf-simulator-ves-client-info
+ project: integration/simulators/nf-simulator/ves-client
+ project-name: integration-simulators-nf-simulator-ves-client
+ build-node: centos8-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify