diff options
70 files changed, 578 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/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml index f48c2cf0e..5908627f6 100644 --- a/jjb/aaf/aaf-sshsm.yaml +++ b/jjb/aaf/aaf-sshsm.yaml @@ -2,12 +2,17 @@ - project: name: aaf-sshsm project-name: 'aaf-sshsm' + build-timeout: 60 + project: 'aaf/sshsm' jobs: - gerrit-maven-clm - project: 'aaf/sshsm' + - '{project-name}-{stream}-verify-c': + script: + !include-raw-escape: 'build-sshsm.sh' stream: - 'master': branch: 'master' + mvn-settings: 'aaf-sshsm-settings' files: '**' archive-artifacts: '' diff --git a/jjb/aaf/build-sshsm.sh b/jjb/aaf/build-sshsm.sh new file mode 100644 index 000000000..f5702cf85 --- /dev/null +++ b/jjb/aaf/build-sshsm.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +echo 'Building AAF/sshsm project' +sh build.sh + 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-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index a8eaefd1a..8273ba3e0 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -19,3 +19,15 @@ mvn-settings: 'aai-search-data-service-settings' files: '**' archive-artifacts: '' +- project: + name: aai-search-data-service-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/search-data-service' + project-name: 'aai-search-data-service' + branch: 'master' + mvn-settings: 'aai-search-data-service-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index e3625ad2d..a0c15cb21 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -8,14 +8,9 @@ - '{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}-aai-docker-java-version-daily': - pom: 'aai-traversal/pom.xml' - mvn-goals: 'docker:build docker:push' - disabled: true + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'aai-traversal/pom.xml' + mvn-profile: 'docker' project: 'aai/traversal' stream: 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-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index e3d8fbaf7..295ce274f 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -4,11 +4,32 @@ project-name: 'dcaegen2-services-heartbeat' jobs: - gerrit-maven-clm + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + project: 'dcaegen2/services/heartbeat' stream: - 'master': branch: 'master' mvn-settings: 'dcaegen2-services-heartbeat-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: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-services-heartbeat-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/services/heartbeat' + project-name: 'dcaegen2-services-heartbeat' + branch: 'master' + mvn-settings: 'dcaegen2-services-heartbeat-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index f91a4c211..96b95bf28 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -2,11 +2,31 @@ - project: name: dcaegen2-utils project-name: 'dcaegen2-utils' + python-version: python3 + subproject: + - 'dcaeapplib': + tox-dir: dcaeapplib/ + tox-envs: '' + - 'onap-dcae-cbs-docker-client': + tox-dir: onap-dcae-cbs-docker-client/ + tox-envs: '' + - 'onap-dcae-dcaepolicy-lib': + tox-dir: onap-dcae-dcaepolicy-lib/ + tox-envs: '' + - 'python-discovery-client': + tox-dir: python-discovery-client/ + tox-envs: '' + - 'python-dockering': + tox-dir: python-dockering/ + tox-envs: '' + jobs: - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{subproject}-python-staging-{stream}' + - '{project-name}-{subproject}-python-release-{stream}' project: 'dcaegen2/utils' stream: @@ -20,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 591b88649..7db34c760 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -1,4 +1,5 @@ --- + - project: name: dmaap-buscontroller project-name: 'dmaap-buscontroller' @@ -7,10 +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' + - '{project-name}-{stream}-docker-java-daily': + mvn-goals: 'clean package docker:build -DpushImage' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + 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-defaults.yaml b/jjb/global-defaults.yaml index 7ec69c6ad..9de47bf9a 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -31,7 +31,7 @@ -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r # Timeout in minutes - build-timeout: 360 + build-timeout: 90 build-node: ubuntu1604-basebuild-2c-1g archive-artifacts: '' diff --git a/jjb/global-jjb b/jjb/global-jjb -Subproject 8e33e6ab798cd57a383cb8871d973de3fce6340 +Subproject 90e4e825b3d0ac5959122c50e457419ad0cfe13 diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 826b6041d..85c275644 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -66,6 +66,14 @@ builders: - shell: !include-raw: include-docker-login.sh +- builder: + name: publish-pypi + builders: + - inject: + properties-content: PYPI_SERVER={pypi-server} + - shell: + !include-raw-escape: ../shell/pypi-publish.sh + # PARAMETERS - parameter: name: infra-parameters diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml new file mode 100644 index 000000000..fc89511ff --- /dev/null +++ b/jjb/global-templates-c.yaml @@ -0,0 +1,51 @@ +--- +# vim: sw=2 ts=2 sts=2 et : + +- job-template: + # + # job template for build C/C++ project + # + # Required Variables: + # script: build script to execute + # + + name: '{project-name}-{stream}-verify-c' + project-type: freestyle + node: '{build-node}' + + 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: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**' + + builders: + - shell: '{script}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' 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/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/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index ce1dcf0cc..9260ea9aa 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -12,6 +12,10 @@ path: 'newton' pattern: 'newton/**' pom: 'newton/pom.xml' + - 'newton_share': + path: 'newton' + pattern: 'share/**' + pom: 'newton/pom.xml' - 'ocata': path: 'ocata' pattern: 'ocata/**' @@ -39,14 +43,42 @@ archive-artifacts: '' build-node: 'ubuntu1604-memcached-4c-4g' - project: - name: multicloud-openstack-sonar + name: multicloud-openstack-newton-sonar jobs: - gerrit-maven-sonar cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'multicloud/openstack' - project-name: 'multicloud-openstack' + project-name: 'multicloud-openstack-newton' + branch: 'master' + mvn-params: '-f newton/pom.xml' + mvn-settings: 'multicloud-openstack-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +- project: + name: multicloud-openstack-ocata-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'multicloud/openstack' + project-name: 'multicloud-openstack-ocata' + branch: 'master' + mvn-params: '-f ocata/pom.xml' + mvn-settings: 'multicloud-openstack-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +- project: + name: multicloud-openstack-windriver-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'multicloud/openstack' + project-name: 'multicloud-openstack-windriver' branch: 'master' + mvn-params: '-f windriver/pom.xml' mvn-settings: 'multicloud-openstack-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml new file mode 100644 index 000000000..7172e7a59 --- /dev/null +++ b/jjb/music/music-csit.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: music-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'music' + stream: 'master' + functionality: + - 'music-test-plan': + trigger_jobs: + - 'music-master-docker-version-java-daily' + robot-options: '' + branch: 'master' + + diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml index 472be894b..1bb3c7151 100644 --- a/jjb/music/music-distributed-kv-store.yaml +++ b/jjb/music/music-distributed-kv-store.yaml @@ -4,7 +4,7 @@ project-name: 'music-distributed-kv-store' path: 'src/dkv' jobs: - - gerrit-maven-clm + - gerrit-python-xc-clm - '{project-name}-{stream}-verify-golang' - '{project-name}-{stream}-merge-golang' project: 'music/distributed-kv-store' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index d0cf29ebf..780d5224c 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -3,18 +3,13 @@ name: music project-name: 'music' jobs: - - gerrit-maven-clm: + - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{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/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml new file mode 100644 index 000000000..bfd709905 --- /dev/null +++ b/jjb/onap-jjb/onap-pypi-template.yaml @@ -0,0 +1,194 @@ +--- +# Job definition Anchors +- pypi_job_boiler_plate: &pypi_job_boiler_plate + name: pypi_job_boiler_plate + + ##################### + # Job Variables # + ##################### + + gerrit_merge_triggers: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: pypi-remerge$ + + gerrit_release_trigger: + - comment-added-contains-event: + comment-contains-value: pypi-release$ + + gerrit_trigger_file_paths: + - compare-type: ANT + pattern: '**' + + ##################### + # Job Configuration # + ##################### + + project-type: freestyle + node: '{build-node}' + + parameters: + - lf-infra-parameters: + project: '{project}' + branch: '{branch}' + stream: '{stream}' + lftools-version: '{lftools-version}' + - lf-infra-tox-parameters: + tox-dir: '{tox-dir}' + tox-envs: '{tox-envs}' + + + properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '$GIT_URL/$PROJECT' + refspec: '$GERRIT_REFSPEC' + branch: '$GERRIT_BRANCH' + submodule-recursive: true + choosing-strategy: default + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + publishers: + - lf-infra-publish + +- job-template: + name: '{project-name}-python-staging-{stream}' + + # Job template for PyPI staging jobs + # Daily Builds + + <<: *pypi_job_boiler_plate + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_merge_triggers}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + + builders: + - lf-infra-tox-install: + python-version: '{python-version}' + - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh + - config-file-provider: + files: + - file-id: pypirc + target: '$HOME/.pypirc' + - shell: + !include-raw-escape: ../shell/pypi-dist-build.sh + + - publish-pypi: + pypi-server: staging + +- job-template: + name: '{project-name}-python-release-{stream}' + + # Job template for PyPI release jobs + + <<: *pypi_job_boiler_plate + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_release_trigger}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + + builders: + - lf-infra-tox-install: + python-version: '{python-version}' + - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh + - config-file-provider: + files: + - file-id: pypirc + target: '$HOME/.pypirc' + - shell: + !include-raw-escape: ../shell/pypi-dist-build.sh + + - publish-pypi: + pypi-server: release + +- job-template: + name: '{project-name}-{subproject}-python-staging-{stream}' + + # Job template for PyPI staging jobs + # Daily Builds + + <<: *pypi_job_boiler_plate + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_merge_triggers}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + + builders: + - lf-infra-tox-install: + python-version: '{python-version}' + - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh + - config-file-provider: + files: + - file-id: pypirc + target: '$HOME/.pypirc' + - shell: + !include-raw-escape: ../shell/pypi-dist-build.sh + + - publish-pypi: + pypi-server: staging + +- job-template: + name: '{project-name}-{subproject}-python-release-{stream}' + + # Job template for PyPI release jobs + + <<: *pypi_job_boiler_plate + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_release_trigger}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + + builders: + - lf-infra-tox-install: + python-version: '{python-version}' + - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh + - config-file-provider: + files: + - file-id: pypirc + target: '$HOME/.pypirc' + - shell: + !include-raw-escape: ../shell/pypi-dist-build.sh + + - publish-pypi: + pypi-server: release diff --git a/jjb/optf/build-optf-has-docker-image.sh b/jjb/optf/build-optf-has-docker-image.sh index d1405f4d2..6c93c8b9d 100644 --- a/jjb/optf/build-optf-has-docker-image.sh +++ b/jjb/optf/build-optf-has-docker-image.sh @@ -5,6 +5,6 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./conductor/docker/*.* +chmod 755 ./*.* -./conductor/docker/build-dockers.sh +./build-dockers.sh diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml new file mode 100644 index 000000000..4413b1429 --- /dev/null +++ b/jjb/optf/optf-has-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: optf-has-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'optf-has' + stream: 'master' + functionality: + - 'has': + trigger_jobs: + - 'optf-has-master-conductor-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index e664f6e81..fb760424c 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -7,9 +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: 'policy/common' stream: diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index bdbfd497d..ccf078eed 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -8,9 +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' project: 'policy/drools-applications' stream: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 920e1eb8d..3fc8f576e 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -6,11 +6,6 @@ - gerrit-maven-clm: mvn-params: '-DskipTests' - '{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}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index e379e4b04..a8a9a1766 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -6,11 +6,6 @@ - gerrit-maven-clm: build-timeout: 30 - '{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}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' 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/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/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh index 36a76a916..d729cb1bd 100755 --- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -5,15 +5,19 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR +echo '============== BUILDING ZTE IMAGE =================' chmod 755 ./zte/vmanager/docker/*.* ./zte/vmanager/docker/build_image.sh +echo '============== BUILDING HUAWEI IMAGE =================' chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.* ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh +echo '============== BUILDING NOKIA V1 IMAGE =================' chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.* ./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh -cd nokiav2/deployment -mvn package -Dexec.args="buildDocker pushImage" +echo '============== BUILDING NOKIA V2 IMAGE =================' +chmod 755 ./nokiav2/deployment/src/main/resources/*.sh +./nokiav2/deployment/src/main/resources/build_image.sh buildDocker pushImage diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 14325d5ea..991b6d4f3 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -30,13 +30,27 @@ archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - project: - name: vfc-nfvo-wfengine-sonar + name: vfc-nfvo-wfengine-wfenginemgrservice-sonar jobs: - gerrit-maven-sonar + mvn-params: '-f wfenginemgrservice/pom.xml' cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'vfc/nfvo/wfengine' - project-name: 'vfc-nfvo-wfengine' + project-name: 'vfc-nfvo-wfengine-wfenginemgrservice' + branch: 'master' + mvn-settings: 'vfc-nfvo-wfengine-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +- project: + name: vfc-nfvo-wfengine-activiti-extension-sonar + jobs: + - gerrit-maven-sonar + mvn-params: '-f activiti-extension/pom.xml' + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/nfvo/wfengine' + project-name: 'vfc-nfvo-wfengine-activiti-extension' branch: 'master' mvn-settings: 'vfc-nfvo-wfengine-settings' mvn-goals: 'clean install' 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-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml index e457db9aa..f8eb21393 100644 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml @@ -3,15 +3,34 @@ name: vnfsdk-ice project-name: 'vnfsdk-ice' project: 'vnfsdk/ice' + pom: 'pom.xml' stream: - 'master': branch: 'master' subproject: - - ice: - path: '.' - pattern: '**' + - 'scripts': + path: 'validation-scripts' + pattern: 'validation-scripts/**' + pom: 'validation-scripts/pom.xml' + - 'server': + path: 'ice-server' + pattern: 'ice-server/**' + pom: 'ice-server/pom.xml' mvn-settings: 'vnfsdk-ice-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-{subproject}-merge-java' +- project: + name: vnfsdk-ice-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vnfsdk/ice' + project-name: 'vnfsdk-ice' + branch: 'master' + mvn-settings: 'vnfsdk-ice-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 dcfdc23ea..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,5 +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 aef9f2dd7..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' @@ -25,11 +26,11 @@ jobs: - gerrit-maven-sonar cron: 'H 11 * * *' - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' build-node: ubuntu1604-basebuild-4c-4g project: 'vnfsdk/ves-agent' project-name: 'vnfsdk-ves-agent' branch: 'master' + mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' mvn-settings: 'vnfsdk-ves-agent-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml index 9c6124788..0b456705c 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 4fd758301..98a5c9652 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 a7f6763fb..ca680e8e4 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 52f2dbd63..0957cee54 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 85993d25e..b9cba04b4 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -14,5 +14,5 @@ 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' diff --git a/shell/pypi-dist-build.sh b/shell/pypi-dist-build.sh new file mode 100644 index 000000000..7733f6242 --- /dev/null +++ b/shell/pypi-dist-build.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Script to build PyPI artifacts +set -e -x -o pipefail + +virtualenv /tmp/v/twine +source "/tmp/v/twine/bin/activate" + +pip install twine wheel + +cd "$WORKSPACE/$TOX_DIR" +python setup.py sdist bdist_wheel diff --git a/shell/pypi-get.sh b/shell/pypi-get.sh new file mode 100644 index 000000000..40900a5d7 --- /dev/null +++ b/shell/pypi-get.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Script to download PyPI artifacts + +PROJECT_NAME=$(grep name= setup.py | cut -d"'" -f2) +ARTIFACT_VERSION=$(grep __version__ ${PROJECT_NAME}/_version.py | cut -d'"' -f2) +REPO_URL="https://nexus3.onap.org/repository/PyPi.staging/packages" +TAR_NAME="$REPO_URL/$PROJECT_NAME/$ARTIFACT_VERSION/$PROJECT_NAME-$ARTIFACT_VERSION.tar.gz" +WHEEL_NAME="${REPO_URL}/${PROJECT_NAME}/${ARTIFACT_VERSION}/${PROJECT_NAME}-${ARTIFACT_VERSION}-py2-none-any.whl" + +mkdir dist +cd dist + +wget ${TAR_NAME} +wget ${WHEEL_NAME} diff --git a/shell/pypi-publish.sh b/shell/pypi-publish.sh new file mode 100644 index 000000000..7ea3fa2d9 --- /dev/null +++ b/shell/pypi-publish.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Script to publush PyPI artifacts +set -e -x -o pipefail + +virtualenv /tmp/v/twine +source "/tmp/v/twine/bin/activate" + +pip install twine + +cd "$WORKSPACE/$TOX_DIR" +twine upload -r $PYPI_SERVER dist/* |