Skip to content

Commit 3ee2adf

Browse files
authored
Merge pull request #710 from jenkinsci/gh-543
fix(rpm) correct openSUSE instructions to ensure autorefresh is enabled on new installations
2 parents d030068 + 42cc36c commit 3ee2adf

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

rpm/build/SOURCES/jenkins.repo

Lines changed: 0 additions & 6 deletions
This file was deleted.

rpm/build/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ D=$(mktemp -d)
55
trap 'rm -rf "${D}"' EXIT
66

77
cp -R "$(dirname "$0")"/* "${D}"
8+
mkdir -p "${D}/SOURCES"
89
cp "${BASE}/systemd/jenkins.service" "${D}/SOURCES"
910
cp "${BASE}/systemd/jenkins.sh" "${D}/SOURCES"
1011
cp "${BASE}/systemd/migrate.sh" "${D}/SOURCES"

rpm/publish/publish.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,16 @@ function generateSite() {
2525
cat >"$D/${ARTIFACTNAME}.repo" <<EOF
2626
[${ARTIFACTNAME}]
2727
name=${PRODUCTNAME}${RELEASELINE}
28+
enabled=1
29+
type=rpm-md
2830
baseurl=${RPM_URL}
2931
gpgkey=${RPM_URL}/repodata/repomd.xml.key
3032
gpgcheck=1
3133
repo_gpgcheck=1
34+
35+
# Only for SUSE/openSUSE distributions with zypper
36+
autorefresh=1
37+
keeppackages=0
3238
EOF
3339

3440
"$BASE/bin/indexGenerator.py" \

templates/header.rpm.html

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,26 @@ <h2>Red Hat and derivatives</h2>
1818

1919
<h2>openSUSE</h2>
2020

21-
To use this repository with openSUSE, run the following command:
22-
21+
To use this repository with openSUSE, start by adding the requirements with the following command:
22+
23+
<pre class="text-white bg-dark">
24+
25+
zypper install dejavu-fonts fontconfig java-21-openjdk wget
26+
</pre>
27+
28+
Then add the repository with run the following command:
29+
2330
<pre class="text-white bg-dark">
2431

25-
sudo zypper addrepo -f {{web_url}}/ {{artifactName}}
32+
wget -O /etc/zypp/repos.d/jenkins.repo \
33+
{{web_url}}/jenkins.repo
2634
</pre>
27-
35+
2836
<p>
2937
With that set up, the {{ product_name }} package can be installed with:
30-
38+
3139
<pre class="text-white bg-dark">
3240

33-
zypper install dejavu-fonts fontconfig java-21-openjdk
3441
zypper install {{ artifactName }}
3542
</pre>
3643
</p>

0 commit comments

Comments
 (0)