diff options
Diffstat (limited to 'jjb')
52 files changed, 175 insertions, 261 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index 7ee7a4c33..5d5774894 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -8,9 +8,6 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-version-java-daily': mvn-goals: 'docker:build' project: 'aaf/authz' @@ -33,4 +30,4 @@ branch: 'master' mvn-settings: 'aaf-authz-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 4ba5d524e..5752db13b 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -7,10 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' project: 'aaf/cadi' stream: - 'master': diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml index b1beb646e..a5a900281 100644 --- a/jjb/aaf/aaf-inno.yaml +++ b/jjb/aaf/aaf-inno.yaml @@ -7,10 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' project: 'aaf/inno' stream: - 'master': @@ -29,4 +25,4 @@ branch: 'master' mvn-settings: 'aaf-inno-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aaf/build-sshsm.sh b/jjb/aaf/build-sshsm.sh index e26d44bfd..f5702cf85 100644 --- a/jjb/aaf/build-sshsm.sh +++ b/jjb/aaf/build-sshsm.sh @@ -4,17 +4,6 @@ CURRENTDIR="$(pwd)" echo $CURRENTDIR -echo 'Building the SoftHSMv2...' +echo 'Building AAF/sshsm project' +sh build.sh -cd SoftHSMv2 -sh autogen.sh -./configure -make check -cd .. - -echo 'Building the TPM2-Plugin...' - -cd TPM2-Plugin -./bootstrap -./configure -make diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 2a89847de..4fc047e89 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -8,11 +8,6 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': disabled: true - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - disabled: true - project: 'aai/aai-common' stream: - 'master': diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index ba37c2433..0c1c2e5df 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -12,11 +12,6 @@ mvn-goals: 'docker:build' - '{project-name}-{stream}-release-version-java-daily': disabled: true - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - disabled: true - project: 'aai/champ' stream: - 'master': diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 14bffbc8a..5c6aac42b 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -8,10 +8,6 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': disabled: true - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - disabled: true - '{project-name}-{stream}-docker-java-daily': docker-pom: 'aai-resources/pom.xml' mvn-profile: 'docker' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 21abd7f38..a0c15cb21 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -8,10 +8,6 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': disabled: true - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - disabled: true - '{project-name}-{stream}-docker-java-daily': docker-pom: 'aai-traversal/pom.xml' mvn-profile: 'docker' diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 0ab3d0eef..ca3b36ff2 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -8,9 +8,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'deployment/docker/pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index d6dcb0168..96b95bf28 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -7,8 +7,8 @@ - 'dcaeapplib': tox-dir: dcaeapplib/ tox-envs: '' - - 'onap-dcae-dbs-docker-client': - tox-dir: onap-dcae-dbs-docker-client/ + - 'onap-dcae-cbs-docker-client': + tox-dir: onap-dcae-cbs-docker-client/ tox-envs: '' - 'onap-dcae-dcaepolicy-lib': tox-dir: onap-dcae-dcaepolicy-lib/ @@ -40,7 +40,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1604-basebuild-4c-4g' - project: name: dcaegen2-utils-sonar jobs: diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index d06314e16..7db34c760 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -8,15 +8,11 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install docker:build' - '{project-name}-{stream}-docker-java-daily': + mvn-goals: 'clean package docker:build -DpushImage' docker-pom: 'pom.xml' mvn-profile: 'docker' - mvn-goals: 'clean install docker:build' - build-node: ubuntu1604-docker-8c-8g + project: 'dmaap/buscontroller' stream: - 'master': diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 6fdbf3e98..1ad6daf44 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -7,10 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' project: 'dmaap/datarouter' stream: - 'master': diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 6dd4c0ed2..602734c79 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -7,17 +7,19 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' project: 'dmaap/dbcapi' + mvn-settings: 'dmaap-dbcapi-settings' stream: - 'master': branch: 'master' - mvn-settings: 'dmaap-dbcapi-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: '' + - project: name: dmaap-dbcapi-sonar jobs: diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index c04e04834..c9ddf7b34 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -7,10 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' project: 'dmaap/messagerouter/dmaapclient' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 3d9274143..3270204c6 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -7,10 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' project: 'dmaap/messagerouter/messageservice' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index c6862ed8a..6b0c1024e 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -7,10 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' project: 'dmaap/messagerouter/mirroragent' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 05bad888d..8de95da18 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -7,10 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' project: 'dmaap/messagerouter/msgrtr' stream: - 'master': diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml index caed98fd1..fc89511ff 100644 --- a/jjb/global-templates-c.yaml +++ b/jjb/global-templates-c.yaml @@ -28,7 +28,7 @@ scm: - gerrit-trigger-scm: - refspec: 'refs/heads/master' + refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' submodule-recursive: '{submodule-recursive}' diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index d3ceac5e2..168fb6203 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -121,3 +121,57 @@ publishers: - infra-shiplogs: maven-version: '{maven-version}' + +- job-template: + # Job template for building & pushing docker images + # + # The purpose of this job template is to run: + # 1. login to the docker registry + # 2. run a specified shell builder + # + + name: '{project-name}-{stream}-docker-golang-shell-daily' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + disabled: false + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + # 12 AM UTC + - timed: 'H 12 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - docker-login + + - shell: '{script}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}'
\ No newline at end of file diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 6ccc2b491..3c662957b 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -2067,85 +2067,6 @@ maven-version: '{maven-version}' - job-template: - # Template for maven site plugin invocation - # - # It's designed to be triggered when the trigger-job job - # succeeds as there's no need for new documentaiton - # if the build job fails. - # - # The purpose of this job template is to run: - # 1. maven set versions - # 2. maven clean site - # - # Those parameters should be set : - # - site-pom : the pom file that contains the site confiration - # - trigger-job : the name of the project that triggers this job - # upon success. The job name can be - # parameterized. - - name: '{project-name}-{stream}-stage-site-java' - project-type: freestyle - node: '{build-node}' - pom: 'pom.xml' - - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - trigger-on-build-success: - job-name: '{trigger-job}' - - builders: - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - inject: - properties-file: version.properties - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - - maven-target: - maven-version: '{maven-version}' - pom: '{site-pom}' - goals: 'clean site:site site:stage-deploy -B' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: # Job template for Java merge jobs for SDC specific repos # # The purpose of this job template is to run: diff --git a/jjb/integration/integration-bootstrap.yaml b/jjb/integration/integration-bootstrap.yaml deleted file mode 100644 index 9fc3f765e..000000000 --- a/jjb/integration/integration-bootstrap.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- project: - name: integration-bootstrap - project-name: 'integration' - project: 'integration' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - subproject: - - 'vagrant-onap': - path: 'bootstrap/vagrant-onap' - pattern: 'bootstrap/vagrant-onap/**' - stream: - - 'master': - branch: 'master' - mvn-settings: 'integration-settings' - build-node: ubuntu1604-basebuild-2c-1g diff --git a/jjb/integration/integration-devtool.yaml b/jjb/integration/integration-devtool.yaml new file mode 100644 index 000000000..15b436915 --- /dev/null +++ b/jjb/integration/integration-devtool.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: integration-devtool + project-name: 'integration-devtool' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + project: 'integration/devtool' + subproject: + - 'devtool': + path: '.' + pattern: '**' + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-devtool-settings' + build-node: ubuntu1604-basebuild-2c-1g diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 2e31310d5..aa26fbcc6 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -10,10 +10,6 @@ - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - project: 'logging-analytics' stream: - 'master': @@ -34,3 +30,42 @@ mvn-settings: 'logging-analytics-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +- project: + name: logging-analytics-pylog + project-name: 'logging-analytics-pylog' + project: 'logging-analytics' + python-version: python3 + stream: + - 'master': + branch: 'master' + mvn-settings: 'logging-analytics-settings' + subproject: + - 'pylog': + pom: 'pylog/pom.xml' + pattern: 'pylog/**' + tox-dir: pylog/ + tox-envs: '' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' + - '{project-name}-{subproject}-python-staging-{stream}' + - '{project-name}-{subproject}-python-release-{stream}' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g +- project: + name: logging-analytics-pylog-python + project-name: 'logging-analytics-pylog' + project: 'logging-analytics' + stream: + - 'master': + branch: 'master' + mvn-settings: 'logging-analytics-settings' + build-node: 'ubuntu1604-basebuild-4c-4g' + subproject: + - 'pylog': + path: 'pylog' + pattern: 'pylog/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 81021daf0..6a52bd605 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -7,10 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - project: 'msb/swagger-sdk' stream: - 'master': diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index 92eb99b40..780d5224c 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -10,11 +10,6 @@ - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: docker - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - build-node: 'ubuntu1604-basebuild-8c-8g' - project: 'music' stream: - 'master': diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index c5660d4f4..2d6d9365c 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -14,11 +14,6 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-java-daily' - - '{project-name}-{stream}-stage-site-java': - pom: 'ecomp-sdk/pom.xml' - site-pom: 'ecomp-sdk/pom.xml' - trigger-job: '{project-name}-{stream}-{subproject-name}-release-java-daily' - project: 'portal/sdk' stream: - 'master': diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 25cee2a94..5f244f6ed 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -5,9 +5,6 @@ jobs: - gerrit-maven-clm: - '{project-name}-{stream}-release-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-java-daily' project: 'portal' stream: - 'master': @@ -30,4 +27,4 @@ branch: 'master' mvn-settings: 'portal-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 306d07290..c9dd15c6e 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -8,9 +8,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'sdc/jtosca' stream: - 'master': @@ -30,4 +27,4 @@ branch: 'master' mvn-settings: 'sdc-jtosca-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 71d7d0ab0..e685eab2e 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -8,9 +8,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'sdc/sdc-distribution-client' stream: - 'master': @@ -30,4 +27,4 @@ branch: 'master' mvn-settings: 'sdc-sdc-distribution-client-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml index a10fcc9ea..d0aac73d5 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -8,10 +8,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - project: 'sdc/sdc-titan-cassandra' stream: - 'master': diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index bb44f833d..1bf90bdfe 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -8,10 +8,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - project: 'sdc/sdc-tosca' stream: - 'master': @@ -31,4 +27,4 @@ branch: 'master' mvn-settings: 'sdc-sdc-tosca-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index f02fa73c3..6d6f3a29e 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -8,10 +8,6 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - project: 'sdc/sdc-workflow-designer' stream: - 'master': @@ -33,4 +29,4 @@ branch: 'master' mvn-settings: 'sdc-sdc-workflow-designer-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 9b5501f43..bc99a175e 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -12,9 +12,6 @@ - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-docker-version-java-daily' - gerrit-maven-clm project: 'sdc' stream: diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 079a5c1f6..719b424d3 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -7,10 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - project: 'so/libs' stream: - 'master': @@ -34,4 +30,4 @@ branch: 'master' mvn-settings: 'so-libs-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index d197c9199..213ffdebf 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -19,11 +19,6 @@ - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - build-node: 'ubuntu1604-basebuild-8c-8g' - project: 'so' stream: - 'master': diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index 44d2db1bf..f2e862d8c 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -27,6 +27,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'testsuite-settings' diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml index 01104c257..1438b3d98 100644 --- a/jjb/ui/ui-dmaapbc.yaml +++ b/jjb/ui/ui-dmaapbc.yaml @@ -8,10 +8,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - project: 'ui/dmaapbc' stream: - 'master': @@ -33,4 +29,4 @@ branch: 'master' mvn-settings: 'ui-dmaapbc-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index bbf558cb7..4dc5285dc 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -10,11 +10,6 @@ - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - build-node: 'ubuntu1604-basebuild-8c-8g' - project: 'vid' stream: - 'master': @@ -34,4 +29,4 @@ branch: 'master' mvn-settings: 'vid-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 55fcb9a43..1e129ee25 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -7,6 +7,7 @@ path: '.' pattern: '**' project: 'vnfsdk/dovetail-integration' + pom: 'pom.xml' stream: - 'master': branch: 'master' @@ -15,3 +16,16 @@ jobs: - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-{subproject}-merge-java' +- project: + name: vnfsdk-dovetail-integration-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vnfsdk/dovetail-integration' + project-name: 'vnfsdk-dovetail-integration' + branch: 'master' + mvn-settings: 'vnfsdk-dovetail-integration-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml index d8864cda4..2e1a7e6ac 100644 --- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml +++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml @@ -1,5 +1,4 @@ --- - - project: name: vnfsdk-pkgtools project-name: 'vnfsdk-pkgtools' @@ -14,6 +13,17 @@ mvn-settings: 'vnfsdk-pkgtools-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' +- project: + name: vnfsdk-pkgtools-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vnfsdk/pkgtools' + project-name: 'vnfsdk-pkgtools' + branch: 'master' + mvn-settings: 'vnfsdk-pkgtools-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index a313f9b83..a41e68df2 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -7,7 +7,8 @@ pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' pattern: 'veslibrary/**' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml index f5dcdff70..8779ee071 100644 --- a/jjb/vvp/vvp-cms.yaml +++ b/jjb/vvp/vvp-cms.yaml @@ -14,7 +14,7 @@ mvn-settings: 'vvp-cms-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' diff --git a/jjb/vvp/vvp-devkit.yaml b/jjb/vvp/vvp-devkit.yaml index 5056fafc0..5bd0d62e8 100644 --- a/jjb/vvp/vvp-devkit.yaml +++ b/jjb/vvp/vvp-devkit.yaml @@ -14,7 +14,7 @@ mvn-settings: 'vvp-devkit-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' docker-pom: 'pom.xml' mvn-profile: 'default' diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml index 222a62bb1..daa8dd853 100644 --- a/jjb/vvp/vvp-documentation.yaml +++ b/jjb/vvp/vvp-documentation.yaml @@ -9,4 +9,4 @@ mvn-settings: 'vvp-documentation-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml index e85268f27..a01bd8459 100644 --- a/jjb/vvp/vvp-engagementmgr.yaml +++ b/jjb/vvp/vvp-engagementmgr.yaml @@ -14,7 +14,7 @@ mvn-settings: 'vvp-engagementmgr-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml index e9840e92c..448717a3b 100644 --- a/jjb/vvp/vvp-gitlab.yaml +++ b/jjb/vvp/vvp-gitlab.yaml @@ -14,7 +14,7 @@ mvn-settings: 'vvp-gitlab-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml index 0ed53a0b0..ca802c076 100644 --- a/jjb/vvp/vvp-image-scanner.yaml +++ b/jjb/vvp/vvp-image-scanner.yaml @@ -14,7 +14,7 @@ mvn-settings: 'vvp-image-scanner-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml index d77180c0d..82037046b 100644 --- a/jjb/vvp/vvp-jenkins.yaml +++ b/jjb/vvp/vvp-jenkins.yaml @@ -14,7 +14,7 @@ mvn-settings: 'vvp-jenkins-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm: + - gerrit-python-xc-clm: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml index a37e2b178..9b2e7794a 100644 --- a/jjb/vvp/vvp-portal.yaml +++ b/jjb/vvp/vvp-portal.yaml @@ -14,7 +14,7 @@ mvn-settings: 'vvp-portal-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml index 782eb5bdc..901c6d7e6 100644 --- a/jjb/vvp/vvp-postgresql.yaml +++ b/jjb/vvp/vvp-postgresql.yaml @@ -14,7 +14,7 @@ mvn-settings: 'vvp-postgresql-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml index 604f4537d..3c79f06b3 100644 --- a/jjb/vvp/vvp-test-engine.yaml +++ b/jjb/vvp/vvp-test-engine.yaml @@ -14,7 +14,7 @@ mvn-settings: 'vvp-test-engine-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index d5c79d742..349f68f70 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -14,7 +14,7 @@ mvn-settings: 'vvp-validation-scripts-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' - project: name: vvp-validation-scripts-sonar |