Skip to content

Commit f181d98

Browse files
committed
tests: replace centos by fedora
Since CentOS is not maintained anymore, we use fedora as an alternative docker image so the tests can continue to be updated The CentOS was causing an error locally when running the tests. Changing to a modern version of Fedora fixes the error
1 parent 8692828 commit f181d98

8 files changed

Lines changed: 16 additions & 17 deletions

File tree

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,9 @@ In the `.cqfdrc` file, one or more flavors may be listed in the
323323
flavor's name.
324324

325325
```ini
326-
[centos7]
327-
command='make CENTOS=1'
328-
distro='centos7'
326+
[fedora]
327+
command='make FEDORA=1'
328+
distro='fedora'
329329

330330
[debug]
331331
command='make DEBUG=1'
@@ -401,8 +401,8 @@ The `-c` option set immediately after the command run allows appending the
401401
command of a cqfd run for temporary developments:
402402

403403
```sh
404-
cqfd -b centos7 run -c "clean"
405-
cqfd -b centos7 run -c "TRACING=1"
404+
cqfd -b fedora run -c "clean"
405+
cqfd -b fedora run -c "TRACING=1"
406406
```
407407

408408
### Running a shell in the container
@@ -544,7 +544,7 @@ cqfd deinit
544544
If a flavor redefines the distro key of the build section, use:
545545

546546
```sh
547-
cqfd -b centos7 deinit
547+
cqfd -b fedora deinit
548548
```
549549

550550
To list all cqfd images across all user projects on the system, use:

cqfd.1.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ another container or another build command.
196196
The _-c_ option set immediately after the command run allows appending the
197197
command of a cqfd run for temporary developments.
198198

199-
$ cqfd -b centos7 run -c "clean"
200-
$ cqfd -b centos7 run -c "TRACING=1"
199+
$ cqfd -b fedora run -c "clean"
200+
$ cqfd -b fedora run -c "TRACING=1"
201201

202202
=== RUNNING A SHELL IN THE CONTAINER
203203

cqfdrc.5.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ build and release methods (for example a debug build). This is made possible in
151151
In the _.cqfdrc_ file, one or more flavors may be listed in the _[build]_
152152
section, referencing other sections named following flavor's name.
153153

154-
[centos7]
155-
command='make CENTOS=1'
156-
distro='centos7'
154+
[fedora]
155+
command='make FEDORA=1'
156+
distro='fedora'
157157

158158
[debug]
159159
command='make DEBUG=1'

tests/01-cqfd_init.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ teardown() {
2626
}
2727

2828
@test "'cqfd init' with a proper Dockerfile should pass" {
29-
sed -i -e "s/\[build\]/[build]\ndistro='centos'/" .cqfdrc
29+
sed -i -e "s/\[build\]/[build]\ndistro='fedora'/" .cqfdrc
3030
run cqfd init
3131
assert_success
3232
}

tests/05-cqfd_init_flavor.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ setup() {
88

99
@test "'cqfd init' with different flavor makes a different container" {
1010
cp -f .cqfdrc .cqfdrc.old
11-
sed -i -e "s/\[foo\]/[foo]\ndistro='centos'/" .cqfdrc
11+
sed -i -e "s/\[foo\]/[foo]\ndistro='fedora'/" .cqfdrc
1212
run cqfd -b "$flavor" init
1313
assert_success
1414
run cqfd -b "$flavor" run "grep '^NAME=' /etc/*release"
15-
assert_line --partial "NAME=\"CentOS Linux\""
15+
assert_line --partial "NAME=\"Fedora Linux\""
1616
}
1717

1818
@test "'cqfd init' with invalid flavor should fail" {

tests/90-cqfd_deinit.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ setup() {
1818
}
1919

2020
@test "'cqfd deinit' with a proper Dockerfile should fail" {
21-
sed -i -e "s/thisshouldfail/centos/" .cqfdrc
21+
sed -i -e "s/thisshouldfail/fedora/" .cqfdrc
2222
run cqfd init
2323
assert_success
2424
run cqfd deinit

tests/test_data/.cqfd/centos/Dockerfile

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FROM fedora:43

0 commit comments

Comments
 (0)