From: Eric Ball <eball@linuxfoundation.org>
Date: Fri, 30 Jun 2023 21:57:58 +0000 (+0000)
Subject: Merge "Fix: Run docker login for gradle build jobs"
X-Git-Tag: v0.88.2^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=ded3781bfc9b13b0743cc7d38f47f34a022e3fa1;hp=73ed0372ccac327ab74cb21f7b897e0681805def;p=releng%2Fglobal-jjb.git

Merge "Fix: Run docker login for gradle build jobs"
---

diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst
index 98bc1537..8a1142e1 100644
--- a/docs/jjb/lf-release-jobs.rst
+++ b/docs/jjb/lf-release-jobs.rst
@@ -305,7 +305,7 @@ This template uses a git commit choosing strategy that builds the merged
 commit with the release yaml file, not the tip of the target branch, so
 projects can repeat the release action in case of merge job failure.
 
-:Template Name: {project-name}-release-merge
+:Template Name: {project-name}-release-merge-{stream}
 
 :Comment Trigger: remerge
 
@@ -321,6 +321,8 @@ projects can repeat the release action in case of merge job failure.
 
     :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
     :build-timeout: Timeout in minutes before aborting build. (default: 15)
+    :stream: Keyword that represents a release code-name.
+        Often the same as the branch. (default: master)
 
     :gerrit_merge_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which
@@ -333,7 +335,7 @@ Release Verify
 
 This template supports Maven and Container release jobs.
 
-:Template Name: {project-name}-release-verify
+:Template Name: {project-name}-release-verify-{stream}
 
 :Comment Trigger: recheck|reverify
 
@@ -352,6 +354,8 @@ This template supports Maven and Container release jobs.
     :build-timeout: Timeout in minutes before aborting build. (default: 15)
     :gerrit-skip-vote: Skip voting for this job. (default: false)
     :git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
+    :stream: Keyword that represents a release code-name.
+        Often the same as the branch. (default: master)
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which
diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 667e75b7..bf76f3b0 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -134,6 +134,7 @@
       - config-file-provider:
           files:
             - file-id: "{packer-cloud-settings}"
+              target: "$HOME/.config/jenkins_jobs/cloud-env.pkrvars.hcl"
               variable: CLOUDENV
       - inject:
           properties-content: |
@@ -164,6 +165,7 @@
       - config-file-provider:
           files:
             - file-id: "{packer-cloud-settings}"
+              target: "$HOME/.config/jenkins_jobs/cloud-env.pkrvars.hcl"
               variable: CLOUDENV
       - inject:
           properties-content: |
diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index 45d8c48e..d7361595 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -44,6 +44,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     gerrit-skip-vote: false
+    stream: master
     use-release-file: true
 
     gerrit_verify_triggers:
@@ -100,7 +101,7 @@
       - lf-release
 
 - job-template:
-    name: "{project-name}-release-verify"
+    name: "{project-name}-release-verify-{stream}"
     id: gerrit-release-verify
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
@@ -142,7 +143,7 @@
             notbuilt: "{gerrit-skip-vote}"
 
 - job-template:
-    name: "{project-name}-release-verify"
+    name: "{project-name}-release-verify-{stream}"
     id: github-release-verify
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
@@ -196,6 +197,7 @@
     build-timeout: 15
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
+    stream: master
     use-release-file: true
 
     gerrit_merge_triggers:
@@ -257,7 +259,7 @@
       - lf-release
 
 - job-template:
-    name: "{project-name}-release-merge"
+    name: "{project-name}-release-merge-{stream}"
     id: gerrit-release-merge
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
@@ -295,7 +297,7 @@
                   pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
 
 - job-template:
-    name: "{project-name}-release-merge"
+    name: "{project-name}-release-merge-{stream}"
     id: github-release-merge
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
diff --git a/releasenotes/notes/release-job-stream-7a8011565adb9b91.yaml b/releasenotes/notes/release-job-stream-7a8011565adb9b91.yaml
new file mode 100644
index 00000000..2cb61c5c
--- /dev/null
+++ b/releasenotes/notes/release-job-stream-7a8011565adb9b91.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Gerrit release verify and merge jobs need to have a {stream} variable in
+    their name to allow the creation of the same job under different branches
+    without conflicting.
diff --git a/releasenotes/notes/update-packer-macros-f19cc00ed8615018.yaml b/releasenotes/notes/update-packer-macros-f19cc00ed8615018.yaml
new file mode 100644
index 00000000..7caa31cd
--- /dev/null
+++ b/releasenotes/notes/update-packer-macros-f19cc00ed8615018.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Pass target file where the config file should be created.
+    New version of packer accepts only .json or .hcl extension filenames.