INFRA: Switch to tox for JJB verify and merge jobs

[infra/cicd.git] / jjb / eiffel / eiffel-gerrit-herald.yaml

diff --git a/jjb/eiffel/eiffel-gerrit-herald.yaml b/jjb/eiffel/eiffel-gerrit-herald.yaml
index 33e2a67c5e6f42429a560f28adec4685f7b85092..f0d79684b6a0c16fa84259e67bbbb15eedd9a19e 100644 (file)
--- a/jjb/eiffel/eiffel-gerrit-herald.yaml
+++ b/jjb/eiffel/eiffel-gerrit-herald.yaml
@@ -28,11 +28,15 @@
     stream:
       - 'master':
           branch: 'master'
-          project-build-macro: 'eiffel-build-periodic-macro'
+          project-git-repo: '{project}'
+          project-build-macro: 'eiffel-global-container-build-macro'
+          image-dockerfile: 'Dockerfile'
+          image-name: '{project}'
+          image-tag: 'dev'
 
     distro: ubuntu2004
 
     jobs:
-      - '{project-name}-build-periodic-{distro}-{stream}'
+      - '{project-name}-build-merge-{distro}-{stream}'
 
 # vim: set ts=2 sw=2 expandtab: