Merge "Activate integration tests"
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 5f3b2cd..fc634fd 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/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 31abe0d..fea8402 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -129,66 +129,105 @@
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
- #
+- verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate
+ name: verification_maven_job_boiler_plate
- name: '{project-name}-{stream}-project-csit'
+ ######################
+ # Default parameters #
+ ######################
+
+ 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
+ container-public-registry: 'nexus3.onap.org:10001'
+ 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-pom: ""
+ mvn-version: mvn36
+ 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
- build-node: 'ubuntu1804-docker-8c-8g'
node: '{build-node}'
- recipients: ''
java-version: 'openjdk11'
- python-version: python3
+
+ #####################
+ # Job Configuration #
+ #####################
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}"
+ - 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}'
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}'
+ 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}
+ - lf-maven-build:
+ mvn-goals: "{mvn-goals}"
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
- integration-run-project-test
-
+ - lf-provide-maven-settings-cleanup
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
@@ -202,118 +241,19 @@
name: '{project-name}-review-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: ""
- 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: '$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-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-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/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
index ad0325b..8b6ab15 100644
--- a/jjb/so/so-so-admin-cockpit.yaml
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@ -12,3 +12,45 @@
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