diff options
Diffstat (limited to 'jjb')
28 files changed, 344 insertions, 51 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 8171e3276..4e172a6e5 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -8,7 +8,6 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' - - '{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/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/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 172fd946e..19e48e48f 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -6,7 +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}-release-version-java-daily-no-sonar' project: 'ccsdk/dashboard' stream: diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml index 98a5b0a71..4292eb3e0 100644 --- a/jjb/ccsdk/platform-nbapi.yaml +++ b/jjb/ccsdk/platform-nbapi.yaml @@ -6,7 +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}-release-version-java-daily-no-sonar' project: 'ccsdk/platform/nbapi' stream: diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 6f445a122..5a2e550b4 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -6,7 +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}-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/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/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/multicloud/build-multicloud-openstack-vmware-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh index e432e86f9..0a8f304ad 100644 --- a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh @@ -8,3 +8,7 @@ echo $CURRENTDIR chmod 755 ./vio/docker/*.* ./vio/docker/build_image.sh + +echo '========================== Building docker for vesagent ==========================' +chmod 755 ./vesagent/docker/*.* +./vesagent/docker/docker-build.sh diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index bc075872d..e2c4ec889 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -11,6 +11,9 @@ - 'vio': pom: 'vio/pom.xml' pattern: 'vio/**' + - 'vesagent': + pom: 'vesagent/pom.xml' + pattern: 'vesagent/**' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml index 62e52f244..7cf21c869 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-python.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-python.yaml @@ -12,5 +12,8 @@ - 'vio': path: 'vio' pattern: 'vio/**' + - 'vesagent': + path: 'vesagent' + pattern: 'vesagent/**' jobs: - '{project-name}-{stream}-{subproject}-verify-python' 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/oom/oneclick-config-build-docker-image.sh b/jjb/oom/oneclick-config-build-docker-image.sh new file mode 100644 index 000000000..2cee98fbc --- /dev/null +++ b/jjb/oom/oneclick-config-build-docker-image.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# +echo '========= CALLING SCRIPT TO BUILD ONECLICK CONFIG TAR FILE =========' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +cd kubernetes/config/docker/init + +chmod 755 *.* + +docker build diff --git a/jjb/oom/oneclick-config-make-tar.sh b/jjb/oom/oneclick-config-make-tar.sh new file mode 100644 index 000000000..da2da2000 --- /dev/null +++ b/jjb/oom/oneclick-config-make-tar.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# +echo '========= CALLING SCRIPT TO BUILD ONECLICK CONFIG TAR FILE =========' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +cd kubernetes/config/docker/init + +chmod 755 *.* + +./make-tar.sh diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml new file mode 100644 index 000000000..be7946237 --- /dev/null +++ b/jjb/oom/oom-oneclick-config.yaml @@ -0,0 +1,42 @@ +--- +- project: + name: oomconfig + project-name: 'oomconfig' + project: 'oom' + + files: '**' + archive-artifacts: '' + build-timeout: 60 + build-node: ubuntu1604-docker-8c-8g + submodule-recursive: true + + jobs: + - '{project}-{stream}-release-config' + stream: + - 'master': + branch: 'master' + +- job-template: + name: '{project}-{stream}-release-config' + project-type: freestyle + node: '{build-node}' + + properties: + - infra-properties: + build-days-to-keep: 14 + + scm: + - gerrit-trigger-scm: + refspec: 'refs/heads/master' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + builders: + - docker-login + - shell: !include-raw-escape: oneclick-config-make-tar.sh + - shell: !include-raw-escape: oneclick-config-build-docker-image.sh + - shell: !include-raw-escape: ../include-docker-push.sh 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/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index aa2a63aee..3dd9df6c2 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -19,8 +19,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - 'release-1.1.0': branch: 'release-1.1.0' mvn-settings: 'sdc-settings' diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml index 7cace1fd0..7cf1c1e61 100644 --- a/jjb/sdnc/sdnc-adaptors.yaml +++ b/jjb/sdnc/sdnc-adaptors.yaml @@ -6,7 +6,7 @@ - '{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}-release-version-java-daily-no-sonar' project: 'sdnc/adaptors' stream: diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml index 6226cacc3..622787714 100644 --- a/jjb/sdnc/sdnc-core.yaml +++ b/jjb/sdnc/sdnc-core.yaml @@ -10,10 +10,10 @@ - '{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}-release-version-java-daily-no-sonar' project: 'sdnc/core' stream: diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml index 54a188575..5118cc179 100644 --- a/jjb/sdnc/sdnc-plugins.yaml +++ b/jjb/sdnc/sdnc-plugins.yaml @@ -6,7 +6,7 @@ - '{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}-release-version-java-daily-no-sonar' project: 'sdnc/plugins' stream: diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 120a604d0..325b0fe1a 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -12,7 +12,8 @@ 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' |