diff options
53 files changed, 311 insertions, 287 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml index d3e75b478..609aab3ba 100644 --- a/jjb/aaf/aaf-authz-docker.yaml +++ b/jjb/aaf/aaf-authz-docker.yaml @@ -11,6 +11,7 @@ - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 - '{project-name}-{stream}-release-java-daily-checkstyle': + setVersion: 'DontSetVersion' mvn_properties: - skipDockerBuild=true - skipDockerTag=true diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index f2c7860c5..8171e3276 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'aaf-authz-settings' mvn-profile: docker docker-pom: 'authz-service/pom.xml' diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 8c5b20dd2..90e513bb8 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'aaf-cadi-settings' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml index 2097444a1..eb4cb8896 100644 --- a/jjb/aaf/aaf-inno.yaml +++ b/jjb/aaf/aaf-inno.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'aaf-inno-settings' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml index 01d5cfda1..4d1eb21ed 100644 --- a/jjb/aai/aai-aai-service.yaml +++ b/jjb/aai/aai-aai-service.yaml @@ -16,8 +16,6 @@ project: 'aai/aai-service' stream: - - 'master': - branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' mvn-settings: 'aai-aai-service-settings' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml new file mode 100644 index 000000000..d4760d222 --- /dev/null +++ b/jjb/aai/aai-babel.yaml @@ -0,0 +1,20 @@ +--- +- project: + name: aai-babel + project-name: 'aai-babel' + jobs: + - '{project-name}-{stream}-clm' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-aai-docker-java-daily': + pom: 'pom.xml' + mvn-goals: 'docker:build' + project: 'aai/babel' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-babel-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml index 7841a6773..303aa5f5c 100644 --- a/jjb/aai/aai-csit.yaml +++ b/jjb/aai/aai-csit.yaml @@ -7,10 +7,14 @@ project-name: 'aai' stream: 'master' functionality: - - 'search-data-service': - trigger_jobs: - 'resources': trigger_jobs: - 'aai-resources-{stream}-aai-docker-java-version-daily' + - 'traversal': + trigger_jobs: + - 'aai-traversal-{stream}-aai-docker-java-version-daily' + - 'esr-server': + trigger_jobs: + - 'aai-esr-server-{stream}-docker-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 6fc991f0f..172fd946e 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.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: 'ccsdk/dashboard' stream: diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 8ed8716fd..21f7759b8 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -6,10 +6,9 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-docker-java-daily' - '{project-name}-{stream}-docker-version-java-daily' - - '{project-name}-docker-image-blessing' project: 'ccsdk/distribution' stream: diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index e8a667d17..8891094b9 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.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: 'ccsdk/parent' stream: diff --git a/jjb/ccsdk/platform-blueprints.yaml b/jjb/ccsdk/platform-blueprints.yaml deleted file mode 100644 index 969d30ef7..000000000 --- a/jjb/ccsdk/platform-blueprints.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ccsdk-platform-blueprints - project-name: 'ccsdk-platform-blueprints' - jobs: - - '{project-name}-{stream}-clm' - - '{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: 'ccsdk/platform/blueprints' - stream: - - 'master': - branch: 'master' - mvn-settings: 'ccsdk-platform-blueprints-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: '' diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml index cf7e85cd6..4292eb3e0 100644 --- a/jjb/ccsdk/platform-nbapi.yaml +++ b/jjb/ccsdk/platform-nbapi.yaml @@ -6,10 +6,7 @@ - '{project-name}-{stream}-clm' - '{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}-release-version-java-daily-no-sonar' project: 'ccsdk/platform/nbapi' stream: diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index b21580115..a39b80697 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -6,10 +6,7 @@ - '{project-name}-{stream}-clm' - '{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}-release-version-java-daily-no-sonar' project: 'ccsdk/platform/plugins' stream: diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index e1ff25cc8..4443a7d62 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.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: 'ccsdk/sli/adaptors' stream: diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 99c71f3a3..dda266f7d 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.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: 'ccsdk/sli/core' stream: diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 1e505f64d..acc26ab37 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.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: 'ccsdk/sli/northbound' stream: diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index be14584e0..b588aacdb 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.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: 'ccsdk/sli/plugins' stream: diff --git a/jjb/ccsdk/storage-esaas.yaml b/jjb/ccsdk/storage-esaas.yaml deleted file mode 100644 index 49a957233..000000000 --- a/jjb/ccsdk/storage-esaas.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- project: - name: ccsdk-storage-esaas - project-name: 'ccsdk-storage-esaas' - jobs: - - '{project-name}-{stream}-clm' - - '{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: 'ccsdk/storage/esaas' - stream: - - 'master': - branch: 'master' - mvn-settings: 'ccsdk-storage-esaas-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: '' diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index e1831e539..5aab63426 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.yaml @@ -6,10 +6,7 @@ - '{project-name}-{stream}-clm' - '{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}-release-version-java-daily-no-sonar' project: 'ccsdk/storage/pgaas' stream: diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 191aa049a..5a2e550b4 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -6,10 +6,7 @@ - '{project-name}-{stream}-clm' - '{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}-release-version-java-daily-no-sonar' project: 'ccsdk/utils' stream: diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index d5b04fecb..da9bc2548 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -10,6 +10,7 @@ - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 - '{project-name}-{stream}-release-java-daily-checkstyle': + setVersion: 'DoSetVersion' mvn_properties: - skipDockerBuild=true - skipDockerTag=true diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml index 62f53b877..f4e5d001c 100644 --- a/jjb/dcaegen2/dcaegen2-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-csit.yaml @@ -8,6 +8,7 @@ functionality: - 'testsuites': trigger_jobs: - - 'dcaegen2-master-release-version-java-daily-no-sonar' + - 'dcaegen2-master-merge-java' + - 'dcaegen2-collectors-ves-master-merge-java' robot-options: '' branch: 'master' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml deleted file mode 100644 index ad94856fe..000000000 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- project: - name: dmaap-buscontroller - project-name: 'dmaap-buscontroller' - jobs: - - '{project-name}-{stream}-clm' - - '{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: 'dmaap/buscontroller/pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' - project: 'dmaap/buscontroller' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'dmaap-buscontroller-settings' - files: '**' - archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-datarouter-docker.yaml b/jjb/dmaap/dmaap-datarouter-docker.yaml deleted file mode 100644 index 873affde8..000000000 --- a/jjb/dmaap/dmaap-datarouter-docker.yaml +++ /dev/null @@ -1,34 +0,0 @@ ----
-
-- project:
- name: dmaap-datarouter-docker
- project-name: 'dmaap-datarouter-docker'
- jobs:
- - '{project-name}-{stream}-clm'
- - '{project-name}-{stream}-verify-java-checkstyle'
- - '{project-name}-{stream}-merge-properties-java':
- mvn_properties:
- - docker.pull.registry=nexus3.onap.org:10001
- - docker.push.registry=nexus3.onap.org:10003
- - '{project-name}-{stream}-release-java-daily-checkstyle':
- mvn_properties:
- - skipDockerBuild=true
- - skipDockerTag=true
- - skipDockerPush=true
- - '{project-name}-{stream}-docker-java-properties-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- maven-properties: |
- skip.docker.build=false
- skip.docker.tag=false
- skip.docker.push=false
- dmaap-datarouter-docker.registry=$
-
- project: 'dmaap/datarouter'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dmaap-datarouter-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml deleted file mode 100644 index 89e78eca7..000000000 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- project: - name: dmaap-datarouter - project-name: 'dmaap-datarouter' - jobs: - - '{project-name}-{stream}-clm' - - '{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': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'dmaap-datarouter-settings' - files: '**' - archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml deleted file mode 100644 index cc5c7d724..000000000 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- project: - name: dmaap-dbcapi - project-name: 'dmaap-dbcapi' - jobs: - - '{project-name}-{stream}-clm' - - '{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: 'dmaap/dbcapi/pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' - project: 'dmaap/dbcapi' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'dmaap-dbcapi-settings' - files: '**' - archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index 9ebc0ddf8..9b8a0289a 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -10,7 +10,6 @@ - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' - '{project-name}-{stream}-docker-version-java-daily' - - '{project-name}-docker-image-blessing' project: 'dmaap/messagerouter/messageservice' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 5f4a16703..9b151ed23 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -15,8 +15,6 @@ stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
files: '**'
archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index a2bba7f44..8db7b7c09 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dmaap-messagerouter-msgrtr-settings' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/ecompsdkos/ecompsdkos.yaml b/jjb/ecompsdkos/ecompsdkos.yaml deleted file mode 100644 index ab562f4a3..000000000 --- a/jjb/ecompsdkos/ecompsdkos.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- project: - name: ecompsdkos - project-name: 'ecompsdkos' - subproject: - - 'ecomp-sdk': - pom: 'ecomp-sdk/pom.xml' - pattern: 'ecomp-sdk/**' - - jobs: - - '{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': - site-pom: 'ecomp-sdk/pom.xml' - trigger-job: '{project-name}-{stream}-{subproject}-release-java-daily' - - project: 'ecompsdkos' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'release-1.1.0': - branch: 'release-1.1.0' - mvn-settings: 'ecompsdkos-settings' - files: '**' - archive-artifacts: '' diff --git a/jjb/global-jjb b/jjb/global-jjb -Subproject 633d8e37f1796d6a1be9c3e5ad85f0322622fe6 +Subproject 21f2869c8f8ac7b2b21130eb16231a8df2904f5 diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 5e69145a0..9cee53c8c 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -435,6 +435,72 @@ maven-version: '{maven-version}' - job-template: + # Job template for Java daily release jobs + # + # The purpose of this job template is to run "maven version && maven clean + # deploy" for projects using this template. + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + name: '{project-name}-{stream}-release-java-daily-no-sonar' + + project-type: freestyle + node: '{build-node}' + maven-deploy-properties: + 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: + # 11 AM UTC + - timed: 'H 11 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - maven-target: + maven-version: '{maven-version}' + goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + properties: + - '{maven-deploy-properties}' + java-opts: + - '-Xmx4096m -XX:MaxPermSize=512m' + 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 daily release jobs running checkstyle at the end # When checkstyle will be fully incorporated, it is meant to replace # '{project-name}-{stream}-release-java-daily' @@ -477,6 +543,22 @@ - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' + - conditional-step: + condition-kind: regex-match + regex: DoSetVersion + label: '{setVersion}' + steps: + - inject: + properties-file: version.properties + - maven-target: + maven-version: '{maven-version}' + 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}' goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B @@ -723,6 +805,83 @@ maven-version: '{maven-version}' - job-template: + # Job template for Java daily release jobs + # + # The purpose of this job template is to run "maven version && maven clean + # deploy" for projects using this template. + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + name: '{project-name}-{stream}-release-version-profile-java-daily' + + project-type: freestyle + node: '{build-node}' + maven-deploy-properties: + 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: + # 11 AM UTC + - timed: 'H 11 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - inject: + properties-file: version.properties + - maven-target: + maven-version: '{maven-version}' + 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}' + goals: 'clean deploy sonar:sonar -P {mvn-profile} -Dsonar.host.url=${{SONAR}} -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + properties: + - '{maven-deploy-properties}' + 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 daily release jobs with POM not at the root # # The purpose of this job template is to run "maven version && maven clean @@ -793,6 +952,76 @@ maven-version: '{maven-version}' - job-template: + # Job template for Java daily release jobs with POM not at the root + # + # The purpose of this job template is to run "maven version && maven clean + # deploy" for projects using this template. + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + # pom: name/location of the pom.xml file relative to the workspace + + + name: '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar' + + project-type: freestyle + node: '{build-node}' + maven-deploy-properties: + 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: + # 11 AM UTC + - timed: 'H 11 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + properties: + - '{maven-deploy-properties}' + java-opts: + - '-Xmx4096m -XX:MaxPermSize=512m' + 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 # # The purpose of this job template is to run "maven clean deploy" for diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index 3f2fe9621..799f85237 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -19,4 +19,4 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 6e0951c05..bc075872d 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -15,9 +15,6 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-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}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml index 0fee3ec22..34ee2017a 100644 --- a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml @@ -2,7 +2,6 @@ - project: name: multicloud-openstack-windriver-csit jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-windriver' stream: 'master' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 4e5abb1f2..a16f0aaa2 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -6,10 +6,10 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' + trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'policy/api' stream: diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 14f26ba1e..db9684541 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -6,10 +6,10 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' + trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'policy/gui' stream: diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 71f1d103b..f0d15bac5 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -6,10 +6,10 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' + trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'policy/pap' stream: diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml index 37d6628c7..36e2616b2 100644 --- a/jjb/policy/policy-pdp.yaml +++ b/jjb/policy/policy-pdp.yaml @@ -6,10 +6,10 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' + trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'policy/pdp' stream: diff --git a/jjb/aai/aai-esr-server-csit.yaml b/jjb/sdc/sdc-csit.yaml index 21bd5ae0c..5603994b3 100644 --- a/jjb/aai/aai-esr-server-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -1,14 +1,14 @@ --- - project: - name: aai-esr-server-csit + name: sdc-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'aai-esr-server' + project-name: 'sdc' stream: 'master' functionality: - - 'sanity-check': + - 'healthCheck': trigger_jobs: - - 'aai-esr-server-master-docker-java-daily' + - '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index afd10fa13..aa2a63aee 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -8,7 +8,7 @@ - '{project-name}-{stream}-sdc-merge-java': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker,docker-staging' diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml index 517e1705c..7cf1c1e61 100644 --- a/jjb/sdnc/sdnc-adaptors.yaml +++ b/jjb/sdnc/sdnc-adaptors.yaml @@ -6,17 +6,12 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java-skip-tests' - '{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}-release-version-java-daily-no-sonar' project: 'sdnc/adaptors' stream: - 'master': branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' mvn-settings: 'sdnc-adaptors-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml index 8c12bc276..622787714 100644 --- a/jjb/sdnc/sdnc-core.yaml +++ b/jjb/sdnc/sdnc-core.yaml @@ -10,20 +10,15 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar' - '{project-name}-{stream}-verify-java-skip-tests' - '{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}-release-version-java-daily-no-sonar' project: 'sdnc/core' stream: - 'master': branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' mvn-settings: 'sdnc-core-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 17f32f49c..a4674235b 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -7,16 +7,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' project: 'sdnc/northbound' stream: - 'master': branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index c7e22fd6f..0ee8893e9 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -7,20 +7,15 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-docker-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: 'sdnc/oam' stream: - 'master': branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml index fa113850e..5118cc179 100644 --- a/jjb/sdnc/sdnc-plugins.yaml +++ b/jjb/sdnc/sdnc-plugins.yaml @@ -6,17 +6,12 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java-skip-tests' - '{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}-release-version-java-daily-no-sonar' project: 'sdnc/plugins' stream: - 'master': branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' mvn-settings: 'sdnc-plugins-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 5f36982ff..3a65a6371 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'so-libs-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 diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index a7b2e2b0b..325b0fe1a 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -12,11 +12,11 @@ mvn-profile: 'with-integration-tests' build-node: 'ubuntu1604-docker-8c-8g' archive-artifacts: 'packages/arquillian-unit-tests/target/**/*' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-profile-java-daily': + mvn-profile: 'with-integration-tests' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' @@ -26,8 +26,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'so-settings' files: '**' archive-artifacts: '' diff --git a/jjb/usecaseui/usecase-ui-server-csit.yaml b/jjb/usecaseui/usecase-ui-server-csit.yaml index 679cc3072..96869fd15 100644 --- a/jjb/usecaseui/usecase-ui-server-csit.yaml +++ b/jjb/usecaseui/usecase-ui-server-csit.yaml @@ -8,6 +8,6 @@ functionality: - 'testsuite': trigger_jobs: - - 'usecase-ui-server-{stream}-version-docker-java-daily' + - '{project-name}-{stream}-docker-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 6cb182b94..cd8368c7e 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -11,7 +11,9 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-docker-java-daily' files: '**' archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh index 89860d94c..db1b504a0 100755 --- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -10,3 +10,6 @@ chmod 755 ./zte/vmanager/docker/*.* chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.* ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh + +chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.* +./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
\ No newline at end of file diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 5e37e0afd..2a2ce3ed0 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -10,7 +10,6 @@ - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index c73035ddc..261f75fde 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -15,6 +15,19 @@ rh_systems() { # Autorelease support packages yum install -y firefox python-tox xmlstarlet xvfb + # Install chrome to support ChromeDriver + cat <<EOF > /etc/yum.repos.d/google-chrome.repo +[google-chrome] +name=google-chrome +baseurl=http://dl.google.com/linux/chrome/rpm/stable/$basearch +enabled=1 +gpgcheck=1 +gpgkey=https://dl-ssl.google.com/linux/linux_signing_key.pub +EOF + + yum -y update + yum -y install google-chrome-stable + # Additional libraries for Python ncclient yum install -y libxml2 libxslt libxslt-devel libffi libffi-devel @@ -49,6 +62,12 @@ ubuntu_systems() { # Autorelease support packages apt-get install -y firefox python-tox xmlstarlet xvfb + # Install chrome to support ChromeDriver + wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - + echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list + apt-get update -y + apt-get install -y google-chrome-stable + # Additional libraries for Python ncclient apt-get install -y wget unzip python-ncclient |