Skip to content

Commit 75c61be

Browse files
get-jenkins-war.sh: update to handle missing latest tag from download… (#996)
* get-jenkins-war.sh: update to handle missing latest tag from download site * gha: switch to using latest version of jenkins vs lts releases * plugins: add required plugins
1 parent 6ccb1a0 commit 75c61be

File tree

4 files changed

+13
-19
lines changed

4 files changed

+13
-19
lines changed

.github/workflows/python-package.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
python-version: ["3.13"]
27-
token: ["stable"]
2827

2928
steps:
3029
- name: Checkout
@@ -52,7 +51,6 @@ jobs:
5251
fail-fast: false
5352
matrix:
5453
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
55-
token: ["stable"]
5654

5755
steps:
5856
- name: Harden Runner
@@ -101,7 +99,5 @@ jobs:
10199
sudo apt-get update; sudo apt-get install libkrb5-dev gcc
102100
103101
- name: Test with pytest
104-
env:
105-
JENKINS_VERSION: ${{ matrix.token }}
106102
run: |
107103
uv run pytest -sv --cov=jenkinsapi --cov-report=term-missing --cov-report=xml jenkinsapi_tests

jenkinsapi/utils/jenkins_launcher.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ class JenkinsLancher(object):
6565
Launch jenkins
6666
"""
6767

68-
JENKINS_WEEKLY_WAR_URL = "http://get.jenkins.io/war/latest/jenkins.war"
69-
JENKINS_LTS_WAR_URL = (
70-
"https://get.jenkins.io/war-stable/latest/jenkins.war"
71-
)
68+
JENKINS_WEEKLY_WAR_URL = "https://get.jenkins.io/war"
69+
JENKINS_LTS_WAR_URL = "https://get.jenkins.io/war-stable"
7270

7371
def __init__(
7472
self,
@@ -109,7 +107,7 @@ def __init__(
109107
self.jenkins_process = None
110108
self.queue = queue.Queue()
111109
self.plugin_urls = plugin_urls or []
112-
if os.environ.get("JENKINS_VERSION", "stable") == "stable":
110+
if os.environ.get("JENKINS_VERSION", "") == "stable":
113111
self.JENKINS_WAR_URL = self.JENKINS_LTS_WAR_URL
114112
else:
115113
self.JENKINS_WAR_URL = self.JENKINS_WEEKLY_WAR_URL

jenkinsapi_tests/systests/conftest.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
"https://updates.jenkins.io/latest/eddsa-api.hpi",
3131
"https://updates.jenkins.io/latest/workflow-step-api.hpi",
3232
"https://updates.jenkins.io/latest/workflow-scm-step.hpi",
33+
"https://updates.jenkins.io/latest/antisamy-markup-formatter.hpi",
34+
"https://updates.jenkins.io/latest/prism-api.hpi",
3335
"https://updates.jenkins.io/latest/junit.hpi",
3436
"https://updates.jenkins.io/latest/script-security.hpi",
3537
"https://updates.jenkins.io/latest/matrix-project.hpi",
@@ -50,24 +52,21 @@
5052
"https://updates.jenkins.io/latest/credentials-binding.hpi",
5153
"https://updates.jenkins.io/latest/jakarta-activation-api.hpi",
5254
"https://updates.jenkins.io/latest/caffeine-api.hpi",
53-
"https://updates.jenkins.io/latest/script-security.hpi",
5455
"https://updates.jenkins.io/latest/checks-api.hpi",
5556
"https://updates.jenkins.io/latest/json-api.hpi",
57+
"https://updates.jenkins.io/latest/jakarta-xml-bind-api.hpi",
5658
"https://updates.jenkins.io/latest/jackson2-api.hpi",
5759
"https://updates.jenkins.io/latest/echarts-api.hpi",
5860
"https://updates.jenkins.io/latest/ionicons-api.hpi",
5961
"https://updates.jenkins.io/latest/plugin-util-api.hpi",
6062
"https://updates.jenkins.io/latest/font-awesome-api.hpi",
6163
"https://updates.jenkins.io/latest/commons-text-api.hpi",
6264
"https://updates.jenkins.io/latest/commons-lang3-api.hpi",
63-
"https://updates.jenkins.io/latest/plugin-util-api.hpi",
6465
"https://updates.jenkins.io/latest/snakeyaml-api.hpi",
6566
"https://updates.jenkins.io/latest/workflow-support.hpi",
6667
"https://updates.jenkins.io/latest/jquery3-api.hpi",
67-
"https://updates.jenkins.io/latest/checks-api.hpi",
6868
"https://updates.jenkins.io/latest/javax-activation-api.hpi",
6969
"https://updates.jenkins.io/latest/jaxb.hpi",
70-
"https://updates.jenkins.io/latest/instance-identity.hpi",
7170
"https://updates.jenkins.io/latest/mailer.hpi",
7271
]
7372

jenkinsapi_tests/systests/get-jenkins-war.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ readonly JENKINS_PATH=$2
1111
readonly WAR_FILENAME=$3
1212

1313
echo "Downloading $JENKINS_WAR_URL to ${JENKINS_PATH}"
14-
if [[ $(type -t wget) ]]; then wget -O ${JENKINS_PATH}/${WAR_FILENAME} -q $JENKINS_WAR_URL
15-
elif [[ $(type -t curl) ]]; then curl -sSL -o ${JENKINS_PATH}/${WAR_FILENAME} $JENKINS_WAR_URL
16-
else
17-
echo "Could not find wget or curl"
18-
exit 1
19-
fi
14+
VER="$(curl -fsSL "$JENKINS_WAR_URL/" | grep -oE 'href="[0-9]+\.[0-9]+/' | sed 's/href="//;s:/$::' | sort -V | tail -1)"
15+
echo "Downloading version $VER"
16+
17+
curl -fL -o "$JENKINS_PATH/jenkins.war" "$JENKINS_WAR_URL/$VER/jenkins.war"
18+
19+
# Optional: verify checksum (Linux)
20+
#curl -fsSL "$JENKINS_WAR_URL/$VER/jenkins.war.sha256" | awk '{print $1" "}' | sha256sum -c -
2021

2122
echo "Jenkins downloaded"

0 commit comments

Comments
 (0)