diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/aai/aai-babel.yaml | 2 | ||||
| -rw-r--r-- | jjb/aai/aai-data-router.yaml | 2 | ||||
| -rw-r--r-- | jjb/aai/aai-model-loader.yaml | 2 | ||||
| -rw-r--r-- | jjb/aai/aai-sparky-be.yaml | 2 | ||||
| -rw-r--r-- | jjb/aai/aai-spike.yaml | 2 | ||||
| -rw-r--r-- | jjb/policy/policy-csit.yaml | 4 | ||||
| -rw-r--r-- | jjb/portal-sdk/portal-sdk.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-apps.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-northbound.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-oam.yaml | 2 |
10 files changed, 15 insertions, 7 deletions
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index cab62d047..71e05e0c3 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: 'docker:build -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 357727522..eb918b2bd 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: 'docker:build -B -Dmaven.test.skip=true' + mvn-params: '-P docker -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 152f01d15..86505f4c5 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: 'docker:build -B -Dmaven.test.skip=true' + mvn-params: '-P docker -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 7e270003a..a1a68d6d2 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: '-f sparkybe-onap-application/pom.xml docker:build -B -Dmaven.test.skip=true' + mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index ec5228a38..d1a19abe6 100644 --- a/jjb/aai/aai-spike.yaml +++ b/jjb/aai/aai-spike.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: 'docker:build -B -Dmaven.test.skip=true' + mvn-params: '-P docker -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index b0b61db0c..3579ab3c1 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -10,8 +10,8 @@ functionality: - 'health' trigger_jobs: - - 'policy-engine-{stream}-merge-scm-mvn-script' - - 'policy-drools-pdp-{stream}-merge-scm-mvn-script' + - 'policy-engine-{stream}-merge-java' + - 'policy-drools-pdp-{stream}-merge-java' - 'policy-drools-applications-{stream}-merge-java' robot-options: '' build-timeout: 40 diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index ca0a873a4..a423fd613 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'release-2.6.0': + branch: 'release-2.6.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 739beaf5b..7a2c2a71e 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -27,6 +27,8 @@ stream: - 'master': branch: 'master' + - 'elalto-fluorine': + branch: 'elalto-fluorine' mvn-settings: 'sdnc-apps-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 a65e78065..8363700da 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'elalto-fluorine': + branch: 'elalto-fluorine' 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 695fa4ba1..73b58dd92 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -23,6 +23,8 @@ stream: - 'master': branch: 'master' + - 'elalto-fluorine': + branch: 'elalto-fluorine' mvn-settings: 'sdnc-oam-settings' maven-version: "mvn35" files: '**' |