X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Feiffel%2Fglobal-eiffel-container-build.yaml;h=a531f26c7814e69c917e28766af089d0b394f233;hb=a580a9a0017f253eb730838640bf974ff534ed5e;hp=cf2880096aeef09037b661bc56c185dd18801575;hpb=4dc69aea4fa837e4820a8deebba4dba082daa27a;p=infra%2Fcicd.git

diff --git a/jjb/eiffel/global-eiffel-container-build.yaml b/jjb/eiffel/global-eiffel-container-build.yaml
index cf288009..a531f26c 100644
--- a/jjb/eiffel/global-eiffel-container-build.yaml
+++ b/jjb/eiffel/global-eiffel-container-build.yaml
@@ -18,7 +18,7 @@
 # ============LICENSE_END=========================================================
 
 - job-template:
-    name: '{project-name}-build-{distro}-{stream}-periodic'
+    name: '{project-name}-build-periodic-{distro}-{stream}'
 
     node: 'eiffel-build-{distro}'
 
@@ -42,9 +42,17 @@
           default: git@github.com:eiffel-community
           description: SSH URL of Project Repo on GitHub to clone repo.
       - string:
-          name: PROJECT_BUILD_ROOT
-          default: '{project-build-root}'
-          description: Dockerfiles are located in different paths so this sets the path to navigate in the clone.
+          name: IMAGE_DOCKERFILE
+          default: '{image-dockerfile}'
+          description: Dockerfile to use for building the container image
+      - string:
+          name: IMAGE_NAME
+          default: '{image-name}'
+          description: Name of the container image
+      - string:
+          name: IMAGE_TAG
+          default: '{image-tag}'
+          description: Tag to apply to the container image
       - choice:
           name: HARBOR_EIFFEL_PROJECT
           choices:
@@ -68,7 +76,7 @@
 
     scm:
       - git:
-          url: 'https://github.com/eiffel-community/$PROJECT.git'
+          url: 'https://github.com/eiffel-community/{project-git-repo}.git'
           branches:
             - '*/{branch}'
           refspec: ''
@@ -100,7 +108,6 @@
           single-use: True
 
     builders:
-      - shell:
-          !include-raw-escape: ./scripts/eiffel-container-build-tag-push.sh
+      - '{project-build-macro}'
 
 # vim: set ts=2 sw=2 expandtab: