From: Anil Belur <abelur@linuxfoundation.org>
Date: Mon, 19 Feb 2024 01:16:46 +0000 (+1000)
Subject: Fix: Rename view name to All
X-Git-Tag: v0.90.1~2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=991ef244a41863fe368d8d964e68be3c97aeaa9b;p=releng%2Fglobal-jjb.git

Fix: Rename view name to All

Rename view name 'All'. JJB 6x has introduced a
regression with view name that causing view updates
to fail. The workaround it to use 'All'.

Error:
Unrecognized view-type: All (supported types are: all,
delivery_pipeline, list, nested, pipeline, sectioned)

Update the JJB version in tox for comparing xml output.

Issue: RELENG-5144
Change-Id: I409d2ef2c14b5c5e70c8edb13a802b3c4aae410c
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/releasenotes/notes/view-name-bug-jjb-6x-d5dd611244c0de0c.yaml b/releasenotes/notes/view-name-bug-jjb-6x-d5dd611244c0de0c.yaml
new file mode 100644
index 00000000..38b11a72
--- /dev/null
+++ b/releasenotes/notes/view-name-bug-jjb-6x-d5dd611244c0de0c.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Rename view name 'All'. JJB 6x has introduced a regression with
+    view name that causing view updates to fail on sandbox cleanup.
diff --git a/shell/jenkins-sandbox-cleanup.sh b/shell/jenkins-sandbox-cleanup.sh
index dc69e2b7..10f3b291 100644
--- a/shell/jenkins-sandbox-cleanup.sh
+++ b/shell/jenkins-sandbox-cleanup.sh
@@ -25,7 +25,7 @@ lf-activate-venv --python python3 --venv-file /tmp/.jjb_venv \
 # Recreate the All default view.
 cat << 'EOF' > all-view.yaml
 - view:
-    name: all
+    name: All
     view-type: all
 EOF
 jenkins-jobs -s sandbox update -v all-view.yaml
diff --git a/tox.ini b/tox.ini
index a226bcdb..2cf56b63 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,7 @@ commands =
 [testenv:jjb-compare-xml]
 basepython = python3
 deps =
-    jenkins-job-builder
+    jenkins-job-builder==6.0.0
 allowlist_externals =
     ./jjb-compare-xml.sh
 commands =