Merge "Remove deprecated release job"
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 495b3cc..ec98862 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -15,13 +15,13 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-apigateway-docker-image.sh'
+ - gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-pom: 'distributions/msb-apigateway/pom.xml'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker'
project: 'msb/apigateway'
stream:
- 'master':
diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml
index 3b4df5f..bdb16ab 100644
--- a/jjb/msb/msb-csit.yaml
+++ b/jjb/msb/msb-csit.yaml
@@ -8,12 +8,12 @@
stream: 'master'
functionality:
- 'sanity-check':
- trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
+ trigger_jobs:
- 'rest-service':
- trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
+ trigger_jobs:
- 'tcp-service':
- trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
+ trigger_jobs:
- 'iag-redirect-discovery':
- trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
+ trigger_jobs:
robot-options: ''
branch: 'master'
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 054016d..3c91a97 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -9,13 +9,13 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-discovery-docker-image.sh'
+ - gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
+ maven-versions-plugin: true
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-pom: 'distributions/msb-apigateway/pom.xml'
+ mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker'
project: 'msb/discovery'
stream:
- 'master':
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index 5df6d07..4367193 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -9,7 +9,6 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-release-version-java-daily'
project: 'msb/java-sdk'
stream:
- 'master':
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 8cfdbd4..8e5a1ce 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -9,7 +9,6 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-release-version-java-daily'
project: 'msb/swagger-sdk'
stream:
- 'master':