From cbea7e03eb235a7763d4a65c0a7602aeef27ab05 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Mon, 17 Jul 2023 12:48:40 -0700
Subject: Fix: Remove local deprecated docker template

The local docker build and merge jobs are deprecated and
projects should use global-jjb templates instead.

Having the old template was creating confusion in jjb 5.0.2
where scripts were getting mixed. Is best to remove the old
deprecated template.

aai-common is migrated too to use the new template.

Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I7d1cb277964636ea11cfceccf511ad2dc992dca3
---
 jjb/aai/aai-aai-common.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'jjb/aai')

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index a068a44c8..280972a68 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -84,8 +84,8 @@
 - project:
     name: "aai-aai-common-docker"
     jobs:
-      - "{project-name}-{stream}-verify-docker"
-      - "{project-name}-{stream}-merge-docker"
+      - gerrit-docker-verify
+      - gerrit-docker-merge
       - gerrit-maven-docker-stage:
           sbom-generator: true
           mvn-params: "-P docker -Dmaven.test.skip=true"
@@ -107,9 +107,9 @@
           branch: "kohn"
           distro: "alpine"
           mvn-params: "-P spring-boot-2-1,docker"
-    docker_name: "onap/aai-common-{distro}"
-    docker_build_args: "-f ./Dockerfile.{distro}"
-    docker_root: "$WORKSPACE/Dockerfiles/aai-common/"
+    docker-name: "onap/aai-common-{distro}"
+    docker-build-args: "-f ./Dockerfile.{distro}"
+    docker-root: "$WORKSPACE/Dockerfiles/aai-common/"
     mvn-settings: "aai-aai-common-settings"
     mvn-version: "mvn35"
     files: "Dockerfiles/aai-common/**"
-- 
cgit 1.2.3-korg