diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/aai/aai-aai-common.yaml | 2 | ||||
-rw-r--r-- | jjb/aai/aai-oom.yaml | 4 | ||||
-rw-r--r-- | jjb/ccsdk/ccsdk-csit.yaml | 10 | ||||
-rw-r--r-- | jjb/cps/cps.yaml | 18 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml | 53 | ||||
-rw-r--r-- | jjb/doc/doc.yaml | 16 | ||||
-rw-r--r-- | jjb/integration/integration-templates-csit.yaml | 226 | ||||
-rw-r--r-- | jjb/integration/integration-terraform.yaml | 50 | ||||
-rw-r--r-- | jjb/integration/integration-terragrunt.yaml | 15 | ||||
-rw-r--r-- | jjb/integration/simulators/integration-pnf-simulator.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-csit-jobs.yaml | 59 | ||||
-rw-r--r-- | jjb/policy/policy-csit.yaml | 39 | ||||
-rw-r--r-- | jjb/portal-sdk/portal-sdk.yaml | 4 | ||||
-rw-r--r-- | jjb/so/so-adapters-so-cnf-adapter.yaml | 14 | ||||
-rw-r--r-- | jjb/so/so-adapters-so-etsi-sol003-adapter.yaml | 56 | ||||
-rw-r--r-- | jjb/so/so-adapters-so-etsi-sol005-adapter.yaml | 14 | ||||
-rw-r--r-- | jjb/so/so-adapters-so-nssmf-adapter.yaml | 14 | ||||
-rw-r--r-- | jjb/so/so-adapters-so-oof-adapter.yaml | 14 | ||||
-rw-r--r-- | jjb/so/so-so-admin-cockpit.yaml | 56 | ||||
-rw-r--r-- | jjb/so/so-so-etsi-nfvo.yaml | 56 |
20 files changed, 471 insertions, 251 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 5c7e4622e..f17d6a24a 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -91,7 +91,7 @@ - 'master': branch: 'master' distro: 'alpine' - mvn-params: '-P spring-boot-2-1' + mvn-params: '-P spring-boot-2-1,docker' docker_name: 'onap/aai-common-{distro}' docker_build_args: '-f ./Dockerfile.{distro}' docker_root: '$WORKSPACE/Dockerfiles/aai-common/' diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml index 4ea6eb843..be2c84d46 100644 --- a/jjb/aai/aai-oom.yaml +++ b/jjb/aai/aai-oom.yaml @@ -19,8 +19,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-oom-settings' files: '**' diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 5f3b2cd9f..fc634fdd5 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -3,18 +3,11 @@ name: ccsdk-distribution-csit jobs: - '{project-name}-review-verification-maven-{stream}': - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-snapshot-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' maven-versions-plugin: true - '{project-name}-merge-verification-maven-{stream}': - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-snapshot-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' maven-versions-plugin: true - project-name: 'ccsdk-distribution' recipients: 'dtimoney@att.com' # project name in gerrit @@ -22,10 +15,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' - mvn-global-settings: global-settings robot-options: '' branch: 'master' diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index 9dd6e548e..0a61d7c17 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -36,7 +36,9 @@ project: 'cps' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: "-P docker" - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g @@ -77,3 +79,17 @@ mvn-settings: 'cps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: cps-whitesource + project-name: cps + jobs: + - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'cps-settings' + wss-product-name: cps + mvn-clean-install: true + project: cps + branch: master + build-node: centos7-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index cb83ce386..04c26c012 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -1,5 +1,58 @@ --- - project: + name: dcaegen2-platform-ves-openapi-manager + project-name: 'dcaegen2-platform-ves-openapi-manager' + java-version: openjdk11 + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-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 package docker:build -DpushImageTag' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'dcaegen2/platform/ves-openapi-manager' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-ves-openapi-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: dcaegen2-platform-ves-openapi-sonar + java-version: openjdk11 + 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: '{sonar_mvn_goal}' + cron: '@daily' + build-node: ubuntu1804-docker-8c-8g + project: 'dcaegen2/platform/ves-openapi-manager' + project-name: 'dcaegen2-platform-ves-openapi-manager' + branch: 'master' + mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + + +- project: name: dcaegen2-platform-ves-openapi-manager-project-view project-name: dcaegen2-platform-ves-openapi-manager views: diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index c71411251..fa7f8cf7a 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -18,16 +18,12 @@ rtdproject: 'onap/58810/' mvn-settings: 'doc-settings' stream: - - amsterdam: - branch: 'amsterdam' - - beijing: - branch: 'beijing' - - casablanca: - branch: 'casablanca' - - dublin: - branch: 'dublin' - - elalto: - branch: 'elalto' + - master: + branch: 'master' + - guilin: + branch: 'guilin' + - frankfurt: + branch: 'frankfurt' - project: name: doc-info diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index 31abe0dc7..f0394477b 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -42,7 +42,7 @@ server: '{server-name}' project: 'integration/csit' branch: '{branch}' - files: '**/{project-name}/**' + files: '*/{project-name}/**' builders: - lf-update-java-alternatives: @@ -105,7 +105,7 @@ server: '{server-name}' project: 'integration/csit' branch: '{branch}' - files: '**/{project-name}/**' + files: '*/{project-name}/**' - timed: '@daily' - reverse: jobs: '{obj:trigger_jobs}' @@ -129,78 +129,8 @@ notify-every-unstable-build: false send-to-individuals: true -- job-template: - # Job template for project-specific CSIT jobs - # - # The purpose of this job template is to execute - # project-specific CSIT test cases for docker image versions - # identified by unique docker tag input parameter - # - - name: '{project-name}-{stream}-project-csit' - disabled: '{disabled}' - project-type: freestyle - build-node: 'ubuntu1804-docker-8c-8g' - node: '{build-node}' - recipients: '' - java-version: 'openjdk11' - python-version: python3 - - properties: - - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-test-options: - test-options: '{robot-options}' - - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' - - builders: - - lf-infra-pre-build - - lf-update-java-alternatives: - java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-project-test - - publishers: - - integration-project-robot: - unstable-if: 0.0 - pass-if: 100.0 - - lf-infra-publish - - email: - recipients: '{recipients}' - notify-every-unstable-build: false - send-to-individuals: true - -- job-template: - # Job template for unified review verification jobs in - # project-specific CSIT flow for projects built with maven - # - # The purpose of this job template is to: - # 1. build local snapshot docker images with maven - # 2. run CSIT job with the local images - # 3. give a verify vote to the triggering review - # - - name: '{project-name}-review-verification-maven-{stream}' +- verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate + name: verification_maven_job_boiler_plate ###################### # Default parameters # @@ -208,8 +138,9 @@ branch: master build-days-to-keep: 30 # 30 days in case a release takes long to get approved. + build-node: ubuntu1804-docker-8c-8g build-timeout: 60 - disable-job: false + container-public-registry: 'nexus3.onap.org:10001' git-url: "$GIT_URL/$PROJECT" github-url: "https://github.com" maven-versions-plugin: false @@ -218,10 +149,8 @@ mvn-global-settings: global-settings mvn-goals: clean deploy mvn-opts: "" - mvn-params: "" - maven-version: mvn36 - ossrh-profile-id: "" mvn-pom: "" + mvn-version: mvn36 stream: master submodule-recursive: true submodule-timeout: 10 @@ -239,6 +168,10 @@ node: '{build-node}' java-version: 'openjdk11' + ##################### + # Job Configuration # + ##################### + properties: - lf-infra-properties: project: '{project}' @@ -253,23 +186,12 @@ mvn-opts: "{mvn-opts}" mvn-params: "{mvn-params}" mvn-version: "{mvn-version}" - - maven-exec: - maven-version: '{maven-version}' - - maven-params: - mvn-params: '{mvn-params}' - string: name: ARCHIVE_ARTIFACTS default: "{archive-artifacts}" description: Artifacts to archive to the logs server. - integration-test-options: test-options: '{robot-options}' - - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' - wrappers: - lf-infra-wrappers: build-timeout: '{build-timeout}' @@ -297,7 +219,6 @@ - inject: properties-content: | CONTAINER_PULL_REGISTRY={container-public-registry} - CONTAINER_PUSH_REGISTRY={container-snapshot-registry} - lf-maven-build: mvn-goals: "{mvn-goals}" - integration-install-robotframework @@ -305,15 +226,34 @@ properties-file: 'env.properties' - integration-run-project-test - lf-provide-maven-settings-cleanup + publishers: + - lf-infra-publish +- job-template: + # Job template for unified review verification jobs in + # project-specific CSIT flow for projects built with maven + # + # The purpose of this job template is to: + # 1. build local snapshot docker images with maven + # 2. run CSIT job with the local images + # 3. give a verify vote to the triggering review + # + + name: '{project-name}-review-verification-maven-{stream}' + + <<: *verification_maven_job_boiler_plate + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' triggers: - gerrit-trigger-patch-submitted: server: '{server-name}' project: '{project}' branch: '{branch}' files: '**' - publishers: - - lf-infra-publish - job-template: # Job template for unified merge verification jobs in @@ -326,116 +266,16 @@ name: '{project-name}-merge-verification-maven-{stream}' - ###################### - # Default parameters # - ###################### - - branch: master - build-days-to-keep: 30 # 30 days in case a release takes long to get approved. - build-timeout: 60 - disable-job: false - git-url: "$GIT_URL/$PROJECT" - github-url: "https://github.com" - maven-versions-plugin: false - version-properties-file: version.properties - mvn-central: false - mvn-global-settings: global-settings - mvn-goals: clean deploy - mvn-opts: "" - mvn-params: "" - maven-version: mvn36 - ossrh-profile-id: "" - mvn-pom: "" - sign-artifacts: false - sign-mode: serial - stream: master - submodule-recursive: true - submodule-timeout: 10 - submodule-disable: false - - disabled: '{disabled}' - archive-artifacts: > - **/*.log - **/hs_err_*.log - **/target/**/feature.xml - **/target/failsafe-reports/failsafe-summary.xml - **/target/surefire-reports/*-output.txt - project-type: freestyle - node: '{build-node}' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - lf-infra-maven-parameters: - mvn-opts: "{mvn-opts}" - mvn-params: "{mvn-params}" - mvn-version: "{mvn-version}" - - maven-exec: - maven-version: '{maven-version}' - - maven-params: - mvn-params: '{mvn-params}' - - string: - name: ARCHIVE_ARTIFACTS - default: "{archive-artifacts}" - description: Artifacts to archive to the logs server. - - integration-test-options: - test-options: '{robot-options}' + <<: *verification_maven_job_boiler_plate scm: - gerrit-trigger-scm: refspec: '' choosing-strategy: 'default' submodule-recursive: '{submodule-recursive}' - - wrappers: - - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' - builders: - - lf-infra-pre-build - - lf-jacoco-nojava-workaround - - lf-maven-install: - mvn-version: "{mvn-version}" - - lf-update-java-alternatives: - java-version: "{java-version}" - - lf-infra-docker-login: - global-settings-file: "{mvn-global-settings}" - settings-file: "{mvn-settings}" - # must provide maven settings AFTER docker-login due to its cleanup - - lf-provide-maven-settings: - global-settings-file: "{mvn-global-settings}" - settings-file: "{mvn-settings}" - - lf-maven-versions-plugin: - maven-versions-plugin: "{maven-versions-plugin}" - version-properties-file: "{version-properties-file}" - mvn-version: "{mvn-version}" - mvn-pom: "{mvn-pom}" - mvn-settings: "{mvn-settings}" - - inject: - properties-content: | - CONTAINER_PULL_REGISTRY={container-public-registry} - CONTAINER_PUSH_REGISTRY={container-snapshot-registry} - - lf-maven-build: - mvn-goals: "{mvn-goals}" - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-project-test - - lf-provide-maven-settings-cleanup - triggers: - gerrit-trigger-patch-merged: server: '{server-name}' project: '{project}' branch: '{branch}' files: '**' - publishers: - - lf-infra-publish diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml index 2a7fc5dcf..008945454 100644 --- a/jjb/integration/integration-terraform.yaml +++ b/jjb/integration/integration-terraform.yaml @@ -8,20 +8,48 @@ - gerrit-info-yaml-verify - project: + name: integration-terraform-linters + project: integration/terraform + project-name: integration-terraform + 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' + - 'md': + tox-dir: '.' + tox-envs: 'md' + pattern: '**/*.md' + stream: + - 'master': + branch: 'master' + +- project: name: integration-terraform-validate project: integration/terraform project-name: integration-terraform jobs: - - integration-terraform-verify + - integration-terraform-verify subproject: - - 'openlab': - tox-dir: 'openlab' - tox-envs: 'terraform' - pattern: 'openlab/**' - - 'terragrunt': - tox-dir: 'terragrunt' - tox-envs: 'terragrunt' - pattern: 'terragrunt/**' + - 'openlab': + tox-dir: 'openlab' + tox-envs: 'terraform' + pattern: 'openlab/**' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' diff --git a/jjb/integration/integration-terragrunt.yaml b/jjb/integration/integration-terragrunt.yaml index 922fbc145..04391fb02 100644 --- a/jjb/integration/integration-terragrunt.yaml +++ b/jjb/integration/integration-terragrunt.yaml @@ -44,3 +44,18 @@ stream: - 'master': branch: 'master' + +- project: + name: integration-terragrunt-validate + project: integration/terragrunt + project-name: integration-terragrunt + jobs: + - integration-terraform-verify + subproject: + - 'terragrunt': + tox-dir: '.' + tox-envs: 'terragrunt' + pattern: '**' + stream: + - 'master': + branch: 'master' diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index 481aca909..f426209a7 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -15,7 +15,7 @@ build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-verify-java': - mvn-goals: 'clean install' + 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': diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml new file mode 100644 index 000000000..a9a91be5c --- /dev/null +++ b/jjb/policy/policy-csit-jobs.yaml @@ -0,0 +1,59 @@ +- job-template: + name: '{project-name}-{stream}-project-csit-{functionality}' + disabled: '{disabled}' + project-type: freestyle + build-node: 'ubuntu1804-docker-8c-8g' + node: '{build-node}' + recipients: '' + java-version: 'openjdk11' + python-version: python3 + + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-options: + test-options: '{functionality}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - timed: '@daily' + - reverse: + jobs: '{obj:trigger_jobs}' + + builders: + - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: '{java-version}' + - integration-install-robotframework + - inject: + properties-file: 'env.properties' + - integration-run-project-test + + publishers: + - integration-project-robot: + unstable-if: 0.0 + pass-if: 100.0 + - lf-infra-publish + - email: + recipients: '{recipients}' + notify-every-unstable-build: false + send-to-individuals: true + diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 91fc9ec2d..be3f5c867 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -1,32 +1,30 @@ - project: - name: policy-apex-pdp-csit + name: policy-api-project-csit jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'policy' - java-version: openjdk11 - recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech' + - '{project-name}-{stream}-project-csit-{functionality}' + project-name: 'policy-api' + recipients: 'takamune.cho@att.com' + project: 'policy/docker' stream: - 'master': - branch: master - - 'frankfurt': - branch: frankfurt + branch: 'master' - 'guilin': - branch: guilin + branch: 'guilin' + - 'frankfurt': + branch: 'frankfurt' functionality: - - 'apex-pdp' + - 'api' trigger_jobs: - - 'policy-apex-pdp-{stream}-merge-java' - robot-options: '' + - 'policy-api-{stream}-merge-java' - project: - name: policy-distribution-csit + name: policy-apex-pdp-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' java-version: openjdk11 - recipients: 'ram.krishna.verma@est.tech' + recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech' stream: - 'master': branch: master @@ -35,18 +33,19 @@ - 'guilin': branch: guilin functionality: - - 'distribution' + - 'apex-pdp' trigger_jobs: - - 'policy-distribution-{stream}-merge-java' + - 'policy-apex-pdp-{stream}-merge-java' robot-options: '' - project: - name: policy-api-csit + name: policy-distribution-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' java-version: openjdk11 + recipients: 'ram.krishna.verma@est.tech' stream: - 'master': branch: master @@ -55,9 +54,9 @@ - 'guilin': branch: guilin functionality: - - 'api' + - 'distribution' trigger_jobs: - - 'policy-api-{stream}-merge-java' + - 'policy-distribution-{stream}-merge-java' robot-options: '' - project: diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index a4d46a569..0c54744ff 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.3.0': - branch: 'release-3.3.0' + - 'release-3.4.0': + branch: 'release-3.4.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml new file mode 100644 index 000000000..eac74c8b0 --- /dev/null +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: so-adapters-so-cnf-adapter-project-view + project-name: so-adapters-so-cnf-adapter + views: + - project-view + +- project: + name: so-adapters-so-cnf-adapter-info + project: so/adapters/so-cnf-adapter + project-name: so-adapters-so-cnf-adapter + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml new file mode 100644 index 000000000..2c58c6005 --- /dev/null +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -0,0 +1,56 @@ +--- +- project: + name: so-adapters-so-etsi-sol003-adapter-project-view + project-name: so-adapters-so-etsi-sol003-adapter + views: + - project-view + +- project: + name: so-adapters-so-etsi-sol003-adapter-info + project: so/adapters/so-etsi-sol003-adapter + project-name: so-adapters-so-etsi-sol003-adapter + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: so-adapters-so-etsi-sol003-adapter + project-name: 'so-adapters-so-etsi-sol003-adapter' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project: 'so/adapters/so-etsi-sol003-adapter' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-v1-8c-8g + +- project: + name: so-adapters-so-etsi-sol003-adapter-sonar + java-version: openjdk11 + 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: '{sonar_mvn_goal}' + cron: '@daily' + max-git-repo-age-hours: 48 + build-node: ubuntu1804-docker-v1-8c-8g + project: 'so/adapters/so-etsi-sol003-adapter' + project-name: 'so-adapters-so-etsi-sol003-adapter' + branch: 'master' + mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml new file mode 100644 index 000000000..68e6b261c --- /dev/null +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: so-adapters-so-etsi-sol005-adapter-project-view + project-name: so-adapters-so-etsi-sol005-adapter + views: + - project-view + +- project: + name: so-adapters-so-etsi-sol005-adapter-info + project: so/adapters/so-etsi-sol005-adapter + project-name: so-adapters-so-etsi-sol005-adapter + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml new file mode 100644 index 000000000..b82553be9 --- /dev/null +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: so-adapters-so-nssmf-adapter-project-view + project-name: so-adapters-so-nssmf-adapter + views: + - project-view + +- project: + name: so-adapters-so-nssmf-adapter-info + project: so/adapters/so-nssmf-adapter + project-name: so-adapters-so-nssmf-adapter + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml new file mode 100644 index 000000000..2f61ab7d6 --- /dev/null +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: so-adapters-so-oof-adapter-project-view + project-name: so-adapters-so-oof-adapter + views: + - project-view + +- project: + name: so-adapters-so-oof-adapter-info + project: so/adapters/so-oof-adapter + project-name: so-adapters-so-oof-adapter + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml new file mode 100644 index 000000000..8b6ab1574 --- /dev/null +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -0,0 +1,56 @@ +--- +- project: + name: so-so-admin-cockpit-project-view + project-name: so-so-admin-cockpit + views: + - project-view + +- project: + name: so-so-admin-cockpit-info + project: so/so-admin-cockpit + project-name: so-so-admin-cockpit + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: so-so-admin-cockpit + project-name: 'so-so-admin-cockpit' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project: 'so/so-admin-cockpit' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: 'so-so-admin-cockpit-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-v1-8c-8g + +- project: + name: so-so-admin-cockpit-sonar + java-version: openjdk11 + 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: '{sonar_mvn_goal}' + cron: '@daily' + max-git-repo-age-hours: 48 + build-node: ubuntu1804-docker-v1-8c-8g + project: 'so/so-admin-cockpit' + project-name: 'so-so-admin-cockpit' + branch: 'master' + mvn-settings: 'so-so-admin-cockpit-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml new file mode 100644 index 000000000..0c2e5a9bd --- /dev/null +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -0,0 +1,56 @@ +--- +- project: + name: so-so-etsi-nfvo-project-view + project-name: so-so-etsi-nfvo + views: + - project-view + +- project: + name: so-so-etsi-nfvo-info + project: so/so-etsi-nfvo + project-name: so-so-etsi-nfvo + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: so-so-etsi-nfvo + project-name: 'so-so-etsi-nfvo' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project: 'so/so-etsi-nfvo' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: 'so-so-etsi-nfvo-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-v1-8c-8g + +- project: + name: so-so-etsi-nfvo-sonar + java-version: openjdk11 + 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: '{sonar_mvn_goal}' + cron: '@daily' + max-git-repo-age-hours: 48 + build-node: ubuntu1804-docker-v1-8c-8g + project: 'so/so-etsi-nfvo' + project-name: 'so-so-etsi-nfvo' + branch: 'master' + mvn-settings: 'so-so-etsi-nfvo-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' |