INFRA: Switch to tox for JJB verify and merge jobs

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

diff --git a/jjb/eiffel/global-eiffel-container-build-merge.yaml b/jjb/eiffel/global-eiffel-container-build-merge.yaml
index 70596af7ebcb6383b80ed3c07565c3041aa0881a..8f9b79d466baed330fd3a7d7d41a70864a4a93ae 100644 (file)
--- a/jjb/eiffel/global-eiffel-container-build-merge.yaml
+++ b/jjb/eiffel/global-eiffel-container-build-merge.yaml
@@ -29,20 +29,22 @@
     properties:
       - logrotate
       - github:
-          url: '$GIT_BASE_HTTPS/{project-git-repo}'
+          # NOTE (fdegir): url is hardcoded here since env vars in job properties
+          # do not seem to be resolved correctly, causing job no to function properly
+          url: 'https://github.com/eiffel-community/{project-git-repo}'
 
     parameters:
       - project-parameters:
           project: '{project}'
           branch: '{branch}'
       - string:
-          name: GIT_BASE_HTTPS
+          name: GITHUB_BASE_URL
           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.
+          name: GITHUB_API_URL
+          default: https://api.github.com/repos/eiffel-community
+          description: API URL of Project Repo on GitHub to clone repo.
       - string:
           name: IMAGE_DOCKERFILE
           default: '{image-dockerfile}'
@@ -78,7 +80,7 @@
 
     scm:
       - git:
-          url: '$GIT_BASE_HTTPS/{project-git-repo}.git'
+          url: 'https://github.com/eiffel-community/{project-git-repo}.git'
           branches:
             - '*/{branch}'
           refspec: ''
@@ -103,11 +105,25 @@
       - build-timeout:
           timeout: 10
       - nordixinfra-harbor-creds-wrapper
+      - nordixinfra-eiffel-github-token
       - mask-passwords
       - openstack:
-          single-use: True
+          single-use: true
 
     builders:
       - '{project-build-macro}'
 
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - ABORTED
+                - NOT_BUILT
+                - UNSTABLE
+              build-steps:
+                - 'eiffel-global-pr-comment-macro'
+
 # vim: set ts=2 sw=2 expandtab: