Skip to content

Commit 0bed11f

Browse files
committed
docker,script/spec: update comments and tests
As announced with the v3.6.0 release of the Git LFS client, and as noted in commit 23fbfe8 of PR git-lfs#5911, since all the distribution versions based on Red Hat Enterprise Linux (RHEL) 7, CentOS 7, and SUSE Linux Enterprise Server (SLES) 12 for which we previously built RPM packages have now reached the end of their standard LTS (Long-Term Support) periods, future releases of Git LFS will no longer provide support for these platforms or build packages for them. Because we anticipate making a v3.7.0 release of the Git LFS client in the near future, we removed the Dockerfile we used to build packages for the RHEL/CentOS 7 and SLES 12 platforms in commit git-lfs/build-dockers@cfde130 of PR git-lfs/build-dockers#71. We then also removed the entries for these platforms from the list of our supported Linux distribution versions in the DistroMap Ruby class source file, which is utilized by several scripts run by our GitHub Actions release workflow jobs when building and naming the Linux packages we publish on Packagecloud. Previously, we removed support for the RHEL/CentOS 6 platform in commit d69e28d in PR git-lfs#4328. However, our "docker/run_dockers.bsh" shell script still references these platforms in its comments, so we update that script now to provide more up-to-date usage examples. As well, we update the test data in the Ruby RSpec script we use to validate the DistroMap Ruby class source file, so that the test data now aligns more closely with our current list of supported Linux distribution versions. Note, though, that this change does not affect the behaviour of either the test script or the DistroMap source file.
1 parent 5b28184 commit 0bed11f

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

docker/run_dockers.bsh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/env bash
22

33
# Usage:
4-
# ./run_dockers.bsh # Run all the Docker images
5-
# ./run_dockers.bsh centos_6 centos_7 # Run only the CentOS 6 & 7 Docker images
6-
# ./run_dockers.bsh centos_6 -- bash # Run Bash in the CentOS 6 Docker image
7-
# ./run_dockers.bsh --prune # Remove each Docker image after running
8-
# ./run_dockers.bsh --arch=<arch> # Build for a specific architecture,
9-
# # e.g., arm64
4+
# ./run_dockers.bsh # Run all the Docker images
5+
# ./run_dockers.bsh debian_11 debian_12 # Run only the Debian 11 & 12 images
6+
# ./run_dockers.bsh debian_11 -- bash # Run Bash in the Debian 11 image
7+
# ./run_dockers.bsh --prune # Remove each image after running
8+
# ./run_dockers.bsh --arch=<arch> # Build for a specific architecture,
9+
# # e.g., arm64
1010

1111
# Special Environment Variables
1212
# AUTO_REMOVE - Default 1. If set to 0, the Docker container will not be

script/spec/distro_spec.rb

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,6 @@
22

33
def test_map
44
{
5-
"centos/7" => {
6-
name: "RPM RHEL 7/CentOS 7",
7-
component: "el/7",
8-
image: "centos_7",
9-
package_type: "rpm",
10-
package_tag: "-1.el7",
11-
equivalent: [
12-
"el/7",
13-
"scientific/7",
14-
"opensuse/15.4",
15-
"sles/12.5",
16-
"sles/15.4",
17-
],
18-
},
195
"centos/8" => {
206
name: "RPM RHEL 8/Rocky Linux 8",
217
component: "el/8",
@@ -26,6 +12,20 @@ def test_map
2612
"el/8",
2713
],
2814
},
15+
"rocky/9" => {
16+
name: "RPM RHEL 9/Rocky Linux 9",
17+
component: "el/9",
18+
image: "rocky_9",
19+
package_type: "rpm",
20+
package_tag: "-1.el9",
21+
equivalent: [
22+
"el/9",
23+
"fedora/41",
24+
"fedora/42",
25+
"opensuse/15.6",
26+
"sles/15.6",
27+
],
28+
},
2929
"debian/12" => {
3030
name: "Debian 12",
3131
component: "debian/bookworm",
@@ -46,7 +46,7 @@ def test_map
4646
stderr = StringIO.new
4747
expect(DistroMapProgram.new(stdout, stderr, test_map).run(["--image-names"])).to eq 0
4848
expect(stderr.string).to be_empty
49-
expect(stdout.string).to eq "centos_7 centos_8 debian_12\n"
49+
expect(stdout.string).to eq "centos_8 rocky_9 debian_12\n"
5050
end
5151

5252
it "should print distro markdown" do
@@ -55,8 +55,8 @@ def test_map
5555
expect(DistroMapProgram.new(stdout, stderr, test_map).run(["--distro-markdown"])).to eq 0
5656
expect(stderr.string).to be_empty
5757
expected = <<~EOM
58-
[RPM RHEL 7/CentOS 7](https://packagecloud.io/github/git-lfs/packages/el/7/git-lfs-VERSION-1.el7.x86_64.rpm/download)
5958
[RPM RHEL 8/Rocky Linux 8](https://packagecloud.io/github/git-lfs/packages/el/8/git-lfs-VERSION-1.el8.x86_64.rpm/download)
59+
[RPM RHEL 9/Rocky Linux 9](https://packagecloud.io/github/git-lfs/packages/el/9/git-lfs-VERSION-1.el9.x86_64.rpm/download)
6060
[Debian 12](https://packagecloud.io/github/git-lfs/packages/debian/bookworm/git-lfs_VERSION_amd64.deb/download)
6161
EOM
6262
expect(stdout.string).to eq expected
@@ -74,16 +74,16 @@ def test_map
7474
context DistroMap do
7575
it "should produce the correct distro names" do
7676
map = {
77-
"centos/7" => [
78-
"el/7",
79-
"scientific/7",
80-
"opensuse/15.4",
81-
"sles/12.5",
82-
"sles/15.4",
83-
],
8477
"centos/8" => [
8578
"el/8",
8679
],
80+
"rocky/9" => [
81+
"el/9",
82+
"fedora/41",
83+
"fedora/42",
84+
"opensuse/15.6",
85+
"sles/15.6",
86+
],
8787
"debian/12" => [
8888
"debian/bookworm",
8989
"debian/trixie",
@@ -93,6 +93,6 @@ def test_map
9393
end
9494

9595
it "should produce the correct image names" do
96-
expect(DistroMap.new(test_map).image_names).to eq %w[centos_7 centos_8 debian_12]
96+
expect(DistroMap.new(test_map).image_names).to eq %w[centos_8 rocky_9 debian_12]
9797
end
9898
end

0 commit comments

Comments
 (0)