Merge "Fix job cost amazon exception"

diff --git a/jjb/lf-release-management-jobs.yaml b/jjb/lf-release-management-jobs.yaml
index d2f227c..419ffe5 100644 (file)
--- a/jjb/lf-release-management-jobs.yaml
+++ b/jjb/lf-release-management-jobs.yaml
@@ -13,6 +13,7 @@
     build-days-to-keep: 7
     build-timeout: 15
     disable-job: false
+    project-slug: ""
 
     #####################
     # Job Configuration #
@@ -27,6 +28,8 @@
           build-days-to-keep: "{build-days-to-keep}"
 
     builders:
+      - inject:
+          properties-content: PROJECT_SLUG={project-slug}
       - shell: !include-raw-escape: ../shell/release-announce.sh
 
     wrappers:

diff --git a/releasenotes/notes/fix-release-announce-job-3686ac2f8a598aca.yaml b/releasenotes/notes/fix-release-announce-job-3686ac2f8a598aca.yaml
new file mode 100644 (file)
index 0000000..944d590
--- /dev/null
+++ b/releasenotes/notes/fix-release-announce-job-3686ac2f8a598aca.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fix email notifications for lfdocs-conf releases. The name of the repo
+    does not match the configuration in the code. Add a new PROJECT_SLUG
+    variable to use in case the name of the repo is different from its
+    configuration.

diff --git a/shell/release-announce.sh b/shell/release-announce.sh
index af4ce69..5f94bc5 100644 (file)
--- a/shell/release-announce.sh
+++ b/shell/release-announce.sh
@@ -10,7 +10,12 @@
 ##############################################################################
 echo "---> release-announce.sh"
 
-PROJECT="${GERRIT_PROJECT#releng/}"  # For releng projects strip the prefix
+if [[ $PROJECT_SLUG != "" ]]; then
+    PROJECT="$PROJECT_SLUG"
+else
+    PROJECT="${GERRIT_PROJECT#releng/}"  # For releng projects strip the prefix
+fi
+
 TAG_NAME="${GERRIT_REFNAME#refs/tags/}"
 
 set -eux -o pipefail