From 120a752df3a5ca9294ff0379983dcec249308a58 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:14:05 +0100 Subject: [PATCH 1/5] Init --- Jenkinsfile | 2 +- src/main/resources/ath-container/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 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/src/main/resources/ath-container/run.sh b/src/main/resources/ath-container/run.sh index c50f0346b5..33b7d5f5f3 100755 --- a/src/main/resources/ath-container/run.sh +++ b/src/main/resources/ath-container/run.sh @@ -44,7 +44,7 @@ if [ ! -f $war ]; then case "$war" in "latest") war=jenkins-latest.war - url=https://updates.jenkins.io/latest/jenkins.war + url=https://ci.jenkins.io/job/Core/job/jenkins/job/PR-7770/lastSuccessfulBuild/artifact/org/jenkins-ci/main/jenkins-war/2.397-rc33478.7b_b_c2da_04a_74/jenkins-war-2.397-rc33478.7b_b_c2da_04a_74.war ;; "lts") war=jenkins-lts.war From 7228cb137745aec84f8a688a01b8b6256467e258 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:41:30 +0100 Subject: [PATCH 2/5] Update PluginManager.java --- .../java/org/jenkinsci/test/acceptance/po/PluginManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java b/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java index ecfa370429..8fdbd69290 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java @@ -88,7 +88,7 @@ public void checkForUpdates() { // The check now button is a form submit (POST) with a redirect to the same page only if the check is successful. // We use the button itself to detect when the page has changed, which happens after the refresh has been done // And we check for the presence of the button again - WebElement checkButton = find(by.link("Check now")); + WebElement checkButton = find(by.css("form[action='checkUpdatesServer'] .jenkins-button")); checkButton.click(); // The wait criteria is: we have left the current page and returned to the same one waitFor(checkButton).withTimeout(java.time.Duration.of(time.seconds(30), ChronoUnit.MILLIS)).until(webElement -> { From b7b69bccfa48134b0dd3fc874311f0608463bfc9 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Tue, 28 Mar 2023 14:17:46 +0100 Subject: [PATCH 3/5] Restore Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 317973f8cb..b5f9f51773 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 ['latest']) { + for (String v in ['lts', 'latest']) { int javaVersion = j String jenkinsUnderTest = v def name = "java-${javaVersion}-jenkins-${jenkinsUnderTest}-split${index}" From e35e4d1e05dc6c6b9b1f29b0b0f6b5b1a9b23c46 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Tue, 28 Mar 2023 14:17:56 +0100 Subject: [PATCH 4/5] Restore src/main/resources/ath-container/run.sh --- 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 33b7d5f5f3..c50f0346b5 100755 --- a/src/main/resources/ath-container/run.sh +++ b/src/main/resources/ath-container/run.sh @@ -44,7 +44,7 @@ if [ ! -f $war ]; then case "$war" in "latest") war=jenkins-latest.war - url=https://ci.jenkins.io/job/Core/job/jenkins/job/PR-7770/lastSuccessfulBuild/artifact/org/jenkins-ci/main/jenkins-war/2.397-rc33478.7b_b_c2da_04a_74/jenkins-war-2.397-rc33478.7b_b_c2da_04a_74.war + url=https://updates.jenkins.io/latest/jenkins.war ;; "lts") war=jenkins-lts.war From be8e969cf5990305c31bc331cbe0893323ff4697 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue, 28 Mar 2023 19:35:13 +0100 Subject: [PATCH 5/5] Fix link not being found I had assumed the old button would have been wrapped in a form, instead it does some JS magic to do the post instead. --- .../java/org/jenkinsci/test/acceptance/po/PluginManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java b/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java index 8fdbd69290..d522505cfb 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java @@ -88,7 +88,7 @@ public void checkForUpdates() { // The check now button is a form submit (POST) with a redirect to the same page only if the check is successful. // We use the button itself to detect when the page has changed, which happens after the refresh has been done // And we check for the presence of the button again - WebElement checkButton = find(by.css("form[action='checkUpdatesServer'] .jenkins-button")); + WebElement checkButton = find(by.css("#button-refresh, .jenkins-button[href='checkUpdatesServer']")); checkButton.click(); // The wait criteria is: we have left the current page and returned to the same one waitFor(checkButton).withTimeout(java.time.Duration.of(time.seconds(30), ChronoUnit.MILLIS)).until(webElement -> {