fix ci jobs (daily && no branch param)

[releng.git] / jjb / releng / opnfv-docker.yml

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 0df0ddf..be04b15 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -45,6 +45,18 @@
         - '{project}-docker-build-push-{stream}'
 
 
+- project:
+
+    name: opnfv-monitor-docker        # projects which only monitor dedicated file or path
+
+    project:
+        # projects with jobs for master
+        - 'daisy':
+            <<: *master
+
+    jobs:
+        - '{project}-docker-build-push-monitor-{stream}'
+
 ########################
 # job templates
 ########################
@@ -53,9 +65,11 @@
 
     disabled: '{obj:disabled}'
 
-    parameters:
+    parameters: &parameters
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
@@ -65,14 +79,15 @@
             name: DOCKER_REPO_NAME
             default: "opnfv/{project}"
             description: "Dockerhub repo to be pushed to."
+        - string:
+            name: RELEASE_VERSION
+            default: ""
+            description: "Release version, e.g. 1.0, 2.0, 3.0"
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
-    builders:
+    builders: &builders
         - shell:
             !include-raw-escape: ./opnfv-docker.sh
 
@@ -80,3 +95,28 @@
         - pollscm:
             cron: "*/30 * * * *"
 
+- job-template:
+    name: '{project}-docker-build-push-monitor-{stream}'
+    disabled: '{obj:disabled}'
+    parameters: *parameters
+    scm:
+        - git-scm
+    builders: *builders
+
+    # trigger only matching the file name
+    triggers:
+        - gerrit:
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'docker/**'
+