From 51f2a196ea0297e32f881f0c48806191079e94d3 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 23 Jul 2019 12:39:46 -0700
Subject: [PATCH] Update staging jobs triggers

- Allow lf-maven-stage jobs to be triggered
using either "stage-release" or "stage-maven-release".
- Allow lf-maven-docker-stage jobs to be triggered
using either "stage-release" or "stage-docker-release".

Change-Id: I133063d0cf99ab9b6a06b452ac392959bc678b39
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---
 docs/jjb/lf-maven-jobs.rst                                   |  8 ++++++++
 jjb/lf-maven-jobs.yaml                                       | 12 ++++++++----
 .../notes/update-lf-stage-triggers-c70a1beee566061f.yaml     |  8 ++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/update-lf-stage-triggers-c70a1beee566061f.yaml

diff --git a/docs/jjb/lf-maven-jobs.rst b/docs/jjb/lf-maven-jobs.rst
index ad59153a..fd0b8908 100644
--- a/docs/jjb/lf-maven-jobs.rst
+++ b/docs/jjb/lf-maven-jobs.rst
@@ -351,6 +351,8 @@ directory is then used later to deploy to Nexus.
     - gerrit-maven-stage
     - github-maven-stage
 
+:Comment Trigger: "stage-release" or "stage-maven-release"
+
 :Required parameters:
 
     :build-node: The node to run build on.
@@ -420,11 +422,17 @@ registry in the environment variable CONTAINER_PUSH_REGISTRY.
     - gerrit-maven-docker-stage
     - github-maven-docker-stage
 
+:Comment Trigger: "stage-release" or "stage-docker-release"
+
 :Required parameters:
 
     :container-public-registry: Docker registry source with base images.
     :container-staging-registry: Docker registry target for the deploy action.
 
+:Optional parameters:
+
+    :gerrit_release_docker_triggers: Override Gerrit Triggers.
+
 All other required and optional parameters are identical to the Maven Stage job
 described above.
 
diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index a37aaac5..a012691d 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -833,7 +833,7 @@
 
     gerrit_release_triggers:
       - comment-added-contains-event:
-          comment-contains-value: '^Patch Set\s+\d+:\s+stage-release\s*$'
+          comment-contains-value: '^Patch Set\s+\d+:\s+stage-(maven-)?release\s*$'
 
     gerrit_trigger_file_paths:
       - compare-type: ANT
@@ -964,7 +964,7 @@
     triggers:
       - timed: "{obj:cron}"
       - github-pull-request:
-          trigger-phrase: "^build release$"
+          trigger-phrase: "^stage-(maven-)?release$"
           only-trigger-phrase: true
           status-context: "Maven Release"
           permit-all: true
@@ -1015,6 +1015,10 @@
       # NO lf-maven-central
       - lf-provide-maven-settings-cleanup
 
+    gerrit_release_docker_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$'
+
 - job-template:
     name: "{project-name}-maven-docker-stage-{stream}"
     id: gerrit-maven-docker-stage
@@ -1039,7 +1043,7 @@
       - timed: "{obj:cron}"
       - gerrit:
           server-name: "{gerrit-server-name}"
-          trigger-on: "{obj:gerrit_release_triggers}"
+          trigger-on: "{obj:gerrit_release_docker_triggers}"
           projects:
             - project-compare-type: ANT
               project-pattern: "{project}"
@@ -1077,7 +1081,7 @@
     triggers:
       - timed: "{obj:cron}"
       - github-pull-request:
-          trigger-phrase: "^build release$"
+          trigger-phrase: "^stage-(docker-)?release$"
           only-trigger-phrase: true
           status-context: "Maven Release"
           permit-all: true
diff --git a/releasenotes/notes/update-lf-stage-triggers-c70a1beee566061f.yaml b/releasenotes/notes/update-lf-stage-triggers-c70a1beee566061f.yaml
new file mode 100644
index 00000000..1eef1d91
--- /dev/null
+++ b/releasenotes/notes/update-lf-stage-triggers-c70a1beee566061f.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Allow lf-maven-stage jobs to be triggered
+    using either "stage-release" or "stage-maven-release".
+  - |
+    Allow lf-maven-docker-stage jobs to be triggered
+    using either "stage-release" or "stage-docker-release".
-- 
2.16.6