From 2876ee8bbbed2cd170d9b13292b781115ccea2ab Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Wed, 9 Oct 2019 15:18:07 -0400
Subject: Revert policy/api multiarch change

The policy jobs are failing because the policy/api is not
being generated and the old SNAPSHOT disappeared from nexus.
Until the docker release strategy has decisions on it I need
to revert back to this in order to generate api SNAPSHOTS and
for our CSIT to succeed.

We can put this back in place when the docker release strategy
is decided upon.

Issue-ID: CIMAN-217
Change-Id: I5815082e066a21fc2eeb79023a5ef93b2b5f9c19
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 jjb/policy/policy-api.yaml | 63 +++-------------------------------------------
 1 file changed, 3 insertions(+), 60 deletions(-)

(limited to 'jjb/policy/policy-api.yaml')

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 8a13714ed..ea20cea04 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-api-elalto
+    name: policy-api
     project-name: 'policy-api'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -21,69 +21,12 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
-    project: 'policy/api'
-    stream:
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'policy-api-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-api
-    project-name: 'policy-api'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          project-name: 'policy-api-amd64'
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1604-docker-8c-8g
-          pattern: 'do_not_match_any_file'
-      - '{project-name}-{stream}-merge-java':
-          project-name: 'policy-api-arm64'
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1604-docker-arm64-4c-2g
-          pattern: 'do_not_match_any_file'
-      - '{project-name}-multiarch-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          project-name: 'policy-api-amd64'
-          build-node: ubuntu1604-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          container-public-registry: 'docker.io'
-          container-staging-registry: 'docker.io'
-          cron: ''
-          gerrit_trigger_file_paths:
-             - compare-type: REG_EXP
-               pattern: 'do_not_match_any_file'
-      - gerrit-maven-docker-stage:
-          project-name: 'policy-api-arm64'
-          build-node: ubuntu1604-docker-arm64-4c-2g
-          maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          container-public-registry: 'docker.io'
-          container-staging-registry: 'docker.io'
-          cron: ''
-          gerrit_trigger_file_paths:
-             - compare-type: REG_EXP
-               pattern: 'do_not_match_any_file'
-      - '{project-name}-docker-manifest-{stream}':
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-multiarch-docker-stage-{stream}'
-#      - '{project-name}-gerrit-release-jobs':
-#          build-node: centos7-docker-8c-8g
-
     project: 'policy/api'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-api-settings'
     files: '**'
     archive-artifacts: ''
-- 
cgit 1.2.3-korg