Skip to content
This repository has been archived by the owner on Jun 14, 2023. It is now read-only.

Commit

Permalink
Merge pull request #116 from paddatrapper/fix/test-version-updates
Browse files Browse the repository at this point in the history
Fix CI test failures due to version mis-matches
  • Loading branch information
moshloop authored Feb 16, 2021
2 parents 8ca4e62 + 1856f43 commit 1033b4d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
"debian10":
<<: *test
"centos7":

<<: *test
"fedora29":
<<: *test
Expand Down
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,39 +59,39 @@ e2e-all: deps linux debian ubuntu20 ubuntu18 ubuntu16 fedora centos

.PHONY: amazonlinux2
amazonlinux2: deps
IMAGE=quay.io/footloose/amazonlinux2:0.6.3 ./scripts/e2e.sh $(test)
IMAGE=quay.io/footloose/amazonlinux2:0.6.4 ./scripts/e2e.sh $(test)

.PHONY: debian9
debian9: deps
IMAGE=jrei/systemd-debian:9 ./scripts/e2e.sh $(test)

.PHONY: debian10
debian10: deps
IMAGE=quay.io/footloose/debian10:0.6.3 ./scripts/e2e.sh $(test)
IMAGE=quay.io/footloose/debian10:0.6.4 ./scripts/e2e.sh $(test)

.PHONY: ubuntu16
ubuntu16: deps
IMAGE=quay.io/footloose/ubuntu16.04:0.6.3 ./scripts/e2e.sh $(test)
IMAGE=quay.io/footloose/ubuntu16.04:0.6.4 ./scripts/e2e.sh $(test)

.PHONY: ubuntu18
ubuntu18: deps
IMAGE=quay.io/footloose/ubuntu18.04:0.6.3 ./scripts/e2e.sh $(test)
IMAGE=quay.io/footloose/ubuntu18.04:0.6.4 ./scripts/e2e.sh $(test)

.PHONY: ubuntu20
ubuntu20: deps
IMAGE=docker.io/flanksource/ubuntu:20.04 ./scripts/e2e.sh $(test)

.PHONY: fedora29
fedora29: deps
IMAGE=quay.io/footloose/fedora29:0.6.3 ./scripts/e2e.sh $(test)
IMAGE=quay.io/footloose/fedora29:0.6.4 ./scripts/e2e.sh $(test)

.PHONY: photon3
photon3: deps
IMAGE=docker.io/tarun18/photon:3.0 ./scripts/e2e.sh $(test)

.PHONY: centos7
centos7: deps
IMAGE=quay.io/footloose/centos7:0.6.3 ./scripts/e2e.sh $(test)
IMAGE=quay.io/footloose/centos7:0.6.4 ./scripts/e2e.sh $(test)

.PHONY: centos8
centos8: deps
Expand All @@ -113,7 +113,7 @@ pack:

.PHONY: test-env
test-env:
docker run --privileged -v /sys/fs/cgroup:/sys/fs/cgroup -v $(PWD):$(PWD) -w $(PWD) --rm -it quay.io/footloose/debian10:0.6.3 /lib/systemd/systemd
docker run --privileged -v /sys/fs/cgroup:/sys/fs/cgroup -v $(PWD):$(PWD) -w $(PWD) --rm -it quay.io/footloose/debian10:0.6.4 /lib/systemd/systemd

.PHONY: lint
lint:
Expand Down
2 changes: 1 addition & 1 deletion fixtures/kernel.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kernel:
- 5.3.11-100 #fedora
- 3.10.0-1127.8.2 #centos7 centos8
- 3.10.0-1160 #centos7 centos8
- 4.18.0-193 #centos8 rhel8
- 4.19.0-8 #debian
- 5.4.0-42 #ubuntu
Expand Down

0 comments on commit 1033b4d

Please sign in to comment.