From 6a251ca43fdf07170d5892769b7e66890e4698f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E9=9B=A8=E8=90=BD?= <i@rain.cx>
Date: Fri, 16 Aug 2024 18:18:13 +0800
Subject: [PATCH] updpatch: jenkins 2.472-1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 秋雨落 <i@rain.cx>
---
 jenkins/riscv64.patch      | 43 +++++++++++++++++++++++++++++++++-----
 jenkins/test-timeout.patch | 13 ++++++++++++
 2 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 jenkins/test-timeout.patch

diff --git a/jenkins/riscv64.patch b/jenkins/riscv64.patch
index 072ce2d41..fd1b16429 100644
--- a/jenkins/riscv64.patch
+++ b/jenkins/riscv64.patch
@@ -1,18 +1,51 @@
 --- PKGBUILD
 +++ PKGBUILD
-@@ -35,6 +35,7 @@ sha512sums=('433bcefd436c2c2b45672f5375ced6b229b77d154fafdffc2e6e14fe35a72377ff1
+@@ -13,7 +13,7 @@ arch=('any')
+ url='https://jenkins.io'
+ license=('MIT')
+ depends=("java-runtime=${_java}" 'ttf-dejavu' 'fontconfig')
+-makedepends=("java-environment=${_java}" 'git' 'maven')
++makedepends=("java-environment=${_java}" 'git' 'maven' 'nodejs-lts-iron' 'yarn')
+ provides=('jenkins-ci')
+ conflicts=('jenkins-ci')
+ replaces=('jenkins-ci')
+@@ -24,17 +24,23 @@ source=("https://github.com/jenkinsci/jenkins/archive/refs/tags/jenkins-${pkgver
+         'jenkins.service'
+         'jenkins.tmpfiles'
+         'jenkins.sysusers'
+-        'skip-failing-test.patch')
++        'skip-failing-test.patch'
++        'use-system-yarn.patch'
++        'test-timeout.patch')
+ sha512sums=('830c62a217da2753c69cae37b9108ffc3e9bb380d158b4bc50c681850364be76c266af292fcbaf91a032717cc752895f0b30e0651d2a8fc7162493eba025cdfc'
+             '482b642988027b623995e0488cc00011be5bbe9890a6d40dd6979197fa50794889ff731f798891106b367962cf60cb59b0260caadfcee9685b358a966f759553'
+             'c1e9a542bfd3db54ea0ef57acdac47ad5180330f9ffab44296762b0e69e75ce595d85a77d46025586fb507aedce4f1a032379dcd16b7b886fe475a99849fa4b2'
+             'a845a7147be54affc586dfce9a188ec24c92e673e88dec0b62da386d2e597de6ecda103429008562abd897f179a52c37cf2188ebc65b8c636efd07d707e18f90'
+             '896cbc64eadb2f3bb9fa7fc26dbfc527b1823d8bff3158be7f1936cc250f55eeafe89079e1ceb8f3d269041662573ccbbb36248140b4ba24144a564366f8847a'
+-            '876180dc1674ec56c32a4fceac7d9608f450520ace7d3ecb68cbe7ba8f1bcba31f2c063f52a9076c432b78fd31157da3febc65e98e7d9050a4134d4e0304e8bd')
++            '876180dc1674ec56c32a4fceac7d9608f450520ace7d3ecb68cbe7ba8f1bcba31f2c063f52a9076c432b78fd31157da3febc65e98e7d9050a4134d4e0304e8bd'
++            'ba7d22c9ff7005e3c51d32af25cd2a3db8536a29a160eefa39bc41057c585fedae24cc394afa399f0e703a537f75a023a651f3bc203db17a7e7a1fad4ec75458'
++            'a38e0136e993f04c7f1733008d66c4595b87cb7156ce66a905302a3662e6748c4c80f1645b3aeb1fe9b3f3746fe74320af6ebaa03fd5e1e225f15e71e35b4d66')
+ 
  prepare() {
    cd "${pkgname}-${pkgname}-${pkgver}"
    patch -Np1 <"${srcdir}"/skip-failing-test.patch
 +  patch -Np1 <"${srcdir}"/use-system-yarn.patch
++  patch -p0 <"${srcdir}"/test-timeout.patch
  }
  
  build() {
-@@ -58,3 +59,7 @@ package() {
+@@ -46,7 +52,7 @@ build() {
+ check() {
+   cd "${pkgname}-${pkgname}-${pkgver}"
+   export PATH="/usr/lib/jvm/java-${_java}-openjdk/bin:${PATH}"
+-  mvn -am -Plight-test -Dproject.build.outputTimestamp="${SOURCE_DATE_EPOCH}" test
++  mvn -am -Plight-test -Dproject.build.outputTimestamp="${SOURCE_DATE_EPOCH}" -Djunit.jupiter.execution.timeout.default=20000 test
+ }
+ 
+ package() {
+@@ -58,3 +64,4 @@ package() {
    install -Dm 644 ../jenkins.sysusers "${pkgdir}/usr/lib/sysusers.d/jenkins.conf"
    install -Dm 644 ../jenkins.conf "${pkgdir}/etc/conf.d/jenkins"
  }
 +
-+makedepends+=('nodejs' 'yarn')
-+source+=("use-system-yarn.patch")
-+sha512sums+=('ba7d22c9ff7005e3c51d32af25cd2a3db8536a29a160eefa39bc41057c585fedae24cc394afa399f0e703a537f75a023a651f3bc203db17a7e7a1fad4ec75458')
diff --git a/jenkins/test-timeout.patch b/jenkins/test-timeout.patch
new file mode 100644
index 000000000..eb4b5c4d1
--- /dev/null
+++ b/jenkins/test-timeout.patch
@@ -0,0 +1,13 @@
+diff --git core/src/test/java/jenkins/util/io/PathRemoverTest.java core/src/test/java/jenkins/util/io/PathRemoverTest.java
+index 0702221d39..1590743da3 100644
+--- core/src/test/java/jenkins/util/io/PathRemoverTest.java
++++ core/src/test/java/jenkins/util/io/PathRemoverTest.java
+@@ -69,7 +69,7 @@ import org.jvnet.hudson.test.Issue;
+ public class PathRemoverTest {
+ 
+     @Rule public TemporaryFolder tmp = new TemporaryFolder();
+-    @Rule public Timeout timeout = new Timeout(10, TimeUnit.SECONDS);
++    @Rule public Timeout timeout = new Timeout(30, TimeUnit.SECONDS);
+     @Rule public FileLockerRule locker = new FileLockerRule();
+ 
+     @Test