From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Wed, 4 Apr 2018 19:36:06 +0000 (-0700)
Subject: Revert APPC docker jobs
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F41039%2F1;p=ci-management.git

Revert APPC docker jobs

Revert appc-deployment to use the old docker
jobs. Moving into the new jobs will require a full
re-design of how this repo is built and, being close to the
next release, this effort is bigger than expected.

Change-Id: Ida452fb90e4fb025afc28bb29d699aee708b16c0
Issue-ID: CIMAN-132
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index ee878c483..c3f9edcc8 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -8,12 +8,9 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-verify-docker':
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-merge-docker':
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-release-version-docker-daily-no-sonar':
-          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-version-java-daily'
+      - '{project-name}-docker-image-blessing'
 
     project: 'appc/deployment'
     stream:
@@ -23,7 +20,5 @@
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
-    docker_build_args: '-f docker-files/Dockerfile'
-    docker_name: docker-appc-deployment
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g