X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Feiffel%2Fglobal-eiffel-container-build.yaml;h=a531f26c7814e69c917e28766af089d0b394f233;hb=85c9243ececcc4c93336758e8360d321d90e576a;hp=00f704d4ed3c53014c7eb98f6cc961134581869f;hpb=12206babb8669b62c1c63fc70febe3f7a14f9750;p=infra%2Fcicd.git

diff --git a/jjb/eiffel/global-eiffel-container-build.yaml b/jjb/eiffel/global-eiffel-container-build.yaml
index 00f704d4..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}'
 
@@ -33,15 +33,67 @@
       - project-parameters:
           project: '{project}'
           branch: '{branch}'
-      - eiffel-parameters
+      - string:
+          name: GIT_BASE_HTTPS
+          default: https://github.com/eiffel-community
+          description: HTTPS URL of Project Repo on GitHub to clone repo.
+      - string:
+          name: GIT_BASE_SSH
+          default: git@github.com:eiffel-community
+          description: SSH URL of Project Repo on GitHub to clone repo.
+      - string:
+          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:
+            - eiffel
+            - eiffel-playground
+          description: Project to push container images to. Default is eiffel. eiffel-playground is for development purposes.
+      - choice:
+          name: PODMAN_LOG_LEVEL
+          choices:
+            - error
+            - debug
+            - info
+            - warn
+            - fatal
+            - panic
+          description: Podman log level to use. Default is error.
+      - string:
+          name: NORDIX_REGISTRY
+          default: 'registry.nordix.org'
+          description: Nordix container image registry.
 
     scm:
-      - git-scm-github:
-          branch: '$BRANCH'
+      - git:
+          url: 'https://github.com/eiffel-community/{project-git-repo}.git'
+          branches:
+            - '*/{branch}'
           refspec: ''
-          wipe_workspace: true
-          clean_before: false
-          base_dir: '$WORKSPACE'
+          timeout: 15
+          per-build-tag: false
+          skip-tag: true
+          shallow-clone: false
+          use-author: false
+          ignore-notify: false
+          wipe-workspace: true
+          prune: false
+          clean:
+            after: false
+            before: false
+          choosing-strategy: 'default'
+          basedir: '$WORKSPACE'
+
 
     triggers:
       - pollscm:
@@ -50,9 +102,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: