Merge "Removing Casablanca JJB jobs"

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 210ac11..13a1c5c 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -77,12 +77,9 @@
     project-name: 'aai-aai-common'
     project: 'aai/aai-common'
     stream:
-      - 'master-alpine':
+      - 'master':
           branch: 'master'
           distro: 'alpine'
-      - 'master-ubuntu':
-          branch: 'master'
-          distro: 'ubuntu'
     docker_name: 'onap/aai-common-{distro}'
     docker_build_args: '-f ./Dockerfile.{distro}'
     docker_root: '$WORKSPACE/Dockerfiles/aai-common/'

diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index 9c18eb9..170971e 100644 (file)
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.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'