From 587ae8249f6b62fa1d1b364e4013e0480153a925 Mon Sep 17 00:00:00 2001 From: Raul Arabaolaza Date: Fri, 3 Mar 2023 16:21:06 +0100 Subject: [PATCH 1/4] [Test] Use older 108 esr version of firefox which is the last known working version on the ATH --- src/main/resources/ath-container/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/ath-container/Dockerfile b/src/main/resources/ath-container/Dockerfile index e92f62094b..fedf0a2cf0 100644 --- a/src/main/resources/ath-container/Dockerfile +++ b/src/main/resources/ath-container/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update && \ # No Snaps please https://www.omgubuntu.co.uk/2022/04/how-to-install-firefox-deb-apt-ubuntu-22-04 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN add-apt-repository ppa:mozillateam/ppa && \ - printf 'Package: *\nPin: release o=LP-PPA-mozillateam\nPin-Priority: 1001' | tee /etc/apt/preferences.d/mozilla-firefox + printf 'Package: firefox*\nPin: version 102.8.0*\nPin-Priority: 1001' | tee /etc/apt/preferences.d/mozilla-firefox # hadolint ignore=DL3008 RUN apt-get update && \ @@ -27,7 +27,7 @@ RUN apt-get update && \ git \ imagemagick \ iptables \ - firefox \ + firefox-esr \ unzip \ tightvncserver \ openjdk-11-jdk \ @@ -36,7 +36,7 @@ RUN apt-get update && \ apt-get clean all && rm -rf /var/cache/apt # Selenium needs a geckodriver in order to work properly -ENV GECKODRIVER_VERSION 0.32.0 +ENV GECKODRIVER_VERSION 0.32.2 # gross due to https://github.com/mozilla/geckodriver/issues/1956 RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ if [ "$arch" = "arm64" ] ; \ @@ -94,6 +94,7 @@ COPY run.sh /usr/bin/ RUN chmod u+s "$(which update-alternatives)" RUN dbus-uuidgen > /etc/machine-id +RUN ln -s /lib/firefox-esr/firefox.sh /usr/bin/firefox USER ath-user From a36215c9af84503914f3e4cff229f7490778ccc0 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Fri, 3 Mar 2023 20:35:16 +0000 Subject: [PATCH 2/4] Force http 1.1 --- src/main/resources/ath-container/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/ath-container/run.sh b/src/main/resources/ath-container/run.sh index 7974e45f15..c50f0346b5 100755 --- a/src/main/resources/ath-container/run.sh +++ b/src/main/resources/ath-container/run.sh @@ -26,7 +26,7 @@ fi function download() { echo "Fetching $1 to $2" - status=$(curl -sSL --write-out "%{http_code}" --retry 3 --retry-delay 0 --retry-max-time 60 -o $2 $1) + status=$(curl --http1.1 -sSL --write-out "%{http_code}" --retry 3 --retry-delay 0 --retry-max-time 60 -o $2 $1) if [ "$status" -ne 200 ]; then echo >&2 "Failed to fetch the $1 ($status) to $2" return 1 From 6d97429aa1583d611bdc392005996668c3718218 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Sat, 4 Mar 2023 12:33:44 +0000 Subject: [PATCH 3/4] Ignore tests with known issues --- src/test/java/plugins/ExternalWorkspaceManagerPluginTest.java | 2 ++ src/test/java/plugins/OwnershipPluginTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/test/java/plugins/ExternalWorkspaceManagerPluginTest.java b/src/test/java/plugins/ExternalWorkspaceManagerPluginTest.java index 705c586773..00f34c2b41 100644 --- a/src/test/java/plugins/ExternalWorkspaceManagerPluginTest.java +++ b/src/test/java/plugins/ExternalWorkspaceManagerPluginTest.java @@ -12,6 +12,7 @@ import org.jenkinsci.test.acceptance.slave.SlaveController; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.openqa.selenium.By; @@ -40,6 +41,7 @@ "workflow-job", "ws-cleanup", }) +@Ignore("TODO https://github.com/jenkinsci/external-workspace-manager-plugin/pull/77") public class ExternalWorkspaceManagerPluginTest extends AbstractJUnitTest { @ClassRule diff --git a/src/test/java/plugins/OwnershipPluginTest.java b/src/test/java/plugins/OwnershipPluginTest.java index de4fbeefab..0edbe44355 100644 --- a/src/test/java/plugins/OwnershipPluginTest.java +++ b/src/test/java/plugins/OwnershipPluginTest.java @@ -13,6 +13,7 @@ import org.jenkinsci.test.acceptance.Matcher; import org.jenkinsci.test.acceptance.Matchers; import org.jenkinsci.test.acceptance.junit.AbstractJUnitTest; +import org.junit.Ignore; import org.jvnet.hudson.test.Issue; import org.jenkinsci.test.acceptance.junit.Since; import org.jenkinsci.test.acceptance.junit.WithPlugins; @@ -80,6 +81,7 @@ public void implicitly_set_job_ownership() { @Test @Since("1.509") @Issue("JENKINS-24370") + @Ignore("https://github.com/jenkinsci/acceptance-test-harness/issues/1044") public void correct_redirect_after_save() throws Exception { JenkinsConfig cp = jenkins.getConfigPage(); cp.configure(); From 02cb9aa6863154eb3d8045b705deaf2b0493b6e4 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Sun, 5 Mar 2023 15:30:32 +0000 Subject: [PATCH 4/4] Test clouds rework --- Jenkinsfile | 2 +- Jenkinsfile.infra.ci.jenkins.io | 9 +-------- src/main/resources/ath-container/run.sh | 4 ++-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b5f9f51773..317973f8cb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ branches['CI'] = { for (int i = 0; i < splits.size(); i++) { int index = i for (int j in [11]) { - for (String v in ['lts', 'latest']) { + for (String v in ['latest']) { int javaVersion = j String jenkinsUnderTest = v def name = "java-${javaVersion}-jenkins-${jenkinsUnderTest}-split${index}" diff --git a/Jenkinsfile.infra.ci.jenkins.io b/Jenkinsfile.infra.ci.jenkins.io index 0409d63b30..436fca89e9 100644 --- a/Jenkinsfile.infra.ci.jenkins.io +++ b/Jenkinsfile.infra.ci.jenkins.io @@ -1,8 +1 @@ -// This pipeline runs on infra.ci.jenkins.io (private) to build, test and deploy the Docker image -buildDockerAndPublishImage('ath', [ - automaticSemanticVersioning: false, - gitCredentials: 'jenkinsci-ath-ghapp', // Only available in infra.ci.jenkins.io - dockerfile: 'src/main/resources/ath-container/Dockerfile', - imageDir: 'src/main/resources/ath-container/', - registryNamespace: 'jenkins', -]) +echo "Skipping" diff --git a/src/main/resources/ath-container/run.sh b/src/main/resources/ath-container/run.sh index c50f0346b5..3c8062333f 100755 --- a/src/main/resources/ath-container/run.sh +++ b/src/main/resources/ath-container/run.sh @@ -43,8 +43,8 @@ war=$2 if [ ! -f $war ]; then case "$war" in "latest") - war=jenkins-latest.war - url=https://updates.jenkins.io/latest/jenkins.war + #war=jenkins-latest.war + url=https://repo.jenkins-ci.org/incrementals/org/jenkins-ci/main/jenkins-war/2.394-rc33399.a_9b_e4d03d1fb_/jenkins-war-2.394-rc33399.a_9b_e4d03d1fb_.war ;; "lts") war=jenkins-lts.war