Add JJB macros for Eiffel

Please note that this is the first change in series and the
subsequent changes will utilize the macros defined in this change.

Change-Id: I7f7bdd92fb5bf8620c35fa2578e2177aa19d6692

diff --git a/jjb/eiffel/macros/eiffel-macros.yaml b/jjb/eiffel/macros/eiffel-macros.yaml
new file mode 100644 (file)
index 0000000..de0a9a3
--- /dev/null
+++ b/jjb/eiffel/macros/eiffel-macros.yaml
@@ -0,0 +1,30 @@
+---
+# common parameters for all eiffel projects
+- parameter:
+    name: eiffel-parameters
+    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: 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: PODMAN_LOG_LEVEL
+          choices:
+            - error
+            - debug
+            - info
+            - warn
+            - fatal
+            - panic
+          default: info
+          description: Podman log level to use. Default is error.
+
+# vim: set ts=2 sw=2 expandtab:

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 6a4d11ef8e8743869a9eeb4431e699d651580dbd..c98268cf77421e127e1dc8ce83506b1b87b7c23d 100644 (file)
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -11,6 +11,10 @@
           name: JJB_VERSION
           default: 2.9.1
           description: OpenStack JJB version to install - matches to LFN JJB version
+      - string:
+          name: NORDIX_REGISTRY
+          default: registry.nordix.org
+          description: Nordix Container Image Registry
 
 # these parameters are used for setting the Gerrit Project on Nordix
 - parameter:
@@ -414,6 +418,16 @@
               username: JJB_USERNAME
               password: JJB_USERTOKEN
 
+# wrappers to use for jobs
+- wrapper:
+    name: nordixinfra-harbor-creds-wrapper
+    wrappers:
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: nordix-cicd-harbor-credentials
+              username: HARBOR_USERNAME
+              password: HARBOR_PASSWORD
+
 # timeout wrapper to use for jobs
 - wrapper:
     name: build-timeout