Merge "Handle multiple search extension passed by JJB"

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 98bc714..7c47aec 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -1425,7 +1425,7 @@
       - github-pull-request:
           trigger-phrase: '^(recheck|reverify)$'
           only-trigger-phrase: false
-          status-context: 'Maven Verify'
+          status-context: 'Maven Verify {mvn-version}-{java-version}'
           permit-all: true
           github-hooks: true
           white-list-target-branches:
@@ -1525,7 +1525,7 @@
       - github-pull-request:
           trigger-phrase: '^(recheck|reverify)$'
           only-trigger-phrase: false
-          status-context: 'Maven Docker Verify'
+          status-context: 'Maven Docker Verify {mvn-version}-{java-version}'
           permit-all: true
           github-hooks: true
           white-list-target-branches:

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 8240845..61bb5d2 100644 (file)
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -471,6 +471,7 @@
     # Default parameters #
     ######################
 
+    gerrit-skip-vote: false
     gerrit_verify_triggers:
       - patchset-created-event:
           exclude-drafts: true
@@ -506,6 +507,11 @@
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
               file-paths: '{obj:gerrit_trigger_file_paths}'
+          skip-vote:
+            successful: '{gerrit-skip-vote}'
+            failed: '{gerrit-skip-vote}'
+            unstable: '{gerrit-skip-vote}'
+            notbuilt: '{gerrit-skip-vote}'
 
 - job-template:
     # Python projects typically use tox to run testing.

diff --git a/releasenotes/notes/fix-same-status-context-issue-for-maven-verify-2b3f2047a16db870.yaml b/releasenotes/notes/fix-same-status-context-issue-for-maven-verify-2b3f2047a16db870.yaml
new file mode 100644 (file)
index 0000000..308193c
--- /dev/null
+++ b/releasenotes/notes/fix-same-status-context-issue-for-maven-verify-2b3f2047a16db870.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    fix multiple jobs created using same job-template  update same
+    github check status due to hard coded status-context to Maven Verify.
+    Now appending status-context with maven-version and java-version to
+    make it unique. And create different status checks in the github.
+    fix applied for maven verify and maven docker verify jobs
+

diff --git a/releasenotes/notes/fix_logs_server-4391c56780db6c17.yaml b/releasenotes/notes/fix_logs_server-4391c56780db6c17.yaml
new file mode 100644 (file)
index 0000000..561e327
--- /dev/null
+++ b/releasenotes/notes/fix_logs_server-4391c56780db6c17.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fix log shipping script to not require a LOGS_SERVER. There was a regression
+    that caused the log shipping script to start requiring a LOGS_SERVER which
+    fails in the case of a system that does not have that optional environment
+    variable set.

diff --git a/releasenotes/notes/gerrit-tox-verify-skip-vote-55d4852072f14fa1.yaml b/releasenotes/notes/gerrit-tox-verify-skip-vote-55d4852072f14fa1.yaml
new file mode 100644 (file)
index 0000000..391e6db
--- /dev/null
+++ b/releasenotes/notes/gerrit-tox-verify-skip-vote-55d4852072f14fa1.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    **gerrit-tox-verify** now has a new parameter ``gerrit-skip-vote``
+    (bool) to control whether Jenkins should skip voting depending on
+    the build outcome. It defaults to ``false`` since it is the
+    default used by the Jenkins Gerrit Trigger Plugin.

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index eae4895..a00f0a7 100644 (file)
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -13,7 +13,7 @@ echo "---> logs-deploy.sh"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
-if [[ -z $LOGS_SERVER ]]; then
+if [[ -z $"${LOGS_SERVER:-}" ]]; then
     echo "WARNING: Logging server not set"
 else
     nexus_url="${NEXUSPROXY:-$NEXUS_URL}"