Merge "Update to allow release jobs to run"

[infra/cicd.git] / jjb / eiffel / global-eiffel-container-build.yaml

diff --git a/jjb/eiffel/global-eiffel-container-build.yaml b/jjb/eiffel/global-eiffel-container-build.yaml
index 9c01b26b93484ff37781547618aff1ef28363164..044a8e6e555065e17b1395bc0414ebe9682281de 100644 (file)
--- 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}'
 
@@ -41,10 +41,6 @@
           name: GIT_BASE_SSH
           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.
       - choice:
           name: HARBOR_EIFFEL_PROJECT
           choices:
@@ -94,12 +90,12 @@
     wrappers:
       - build-timeout:
           timeout: 10
+      - nordixinfra-harbor-creds-wrapper
       - mask-passwords
       - openstack:
           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: