fix ci in rhel8

BumbleFeng · BumbleFeng · commit 0db6eca586b3 · 2024-07-01T16:26:14.000-04:00
Signed-off-by: Feng Huang &lt;fehuang@redhat.com&gt;
diff --git a/integration.sh b/integration.sh
@@ -16,6 +16,8 @@ EOF
 
 export QUAY_TOKEN
 
+export DOCKER_HOST=unix:///run/user/${UID}/podman/podman.sock
+
 grep -oE 'Test[A-Za-z0-9]{,}' test/integration_test.go | while read -r test; do
     echo "Running test: ${test}"
     go test -tags integration -count 1 -timeout 300s -run "^${test}$" ./test/...
diff --git a/pr_check.sh b/pr_check.sh
@@ -10,11 +10,14 @@ readonly BASE_IMG="gabi"
 
 {
     set +x
-    docker login quay.io -u "${QUAY_USER}" -p "${QUAY_TOKEN}"
+    podman login quay.io -u "${QUAY_USER}" -p "${QUAY_TOKEN}"
 }
 
 go test ./...
 
-./integration.sh
+podman pull quay.io/app-sre/gnomock-cleaner:latest
+podman tag quay.io/app-sre/gnomock-cleaner:latest docker.io/orlangure/gnomock-cleaner:latest
 
-BUILD_CMD="docker build" IMG="${BASE_IMG}:check" make docker-build
+podman system service -t 0 & ./integration.sh
+
+BUILD_CMD="podman build" IMG="${BASE_IMG}:check" make docker-build

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,14 @@ readonly BASE_IMG="gabi"`
`10`	`10`
`11`	`11`	`{`
`12`	`12`	`set +x`
`13`		`- docker login quay.io -u "${QUAY_USER}" -p "${QUAY_TOKEN}"`
	`13`	`+ podman login quay.io -u "${QUAY_USER}" -p "${QUAY_TOKEN}"`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`go test ./...`
`17`	`17`
`18`		`-./integration.sh`
	`18`	`+podman pull quay.io/app-sre/gnomock-cleaner:latest`
	`19`	`+podman tag quay.io/app-sre/gnomock-cleaner:latest docker.io/orlangure/gnomock-cleaner:latest`
`19`	`20`
`20`		`-BUILD_CMD="docker build" IMG="${BASE_IMG}:check" make docker-build`
	`21`	`+podman system service -t 0 & ./integration.sh`
	`22`	`+`
	`23`	`+BUILD_CMD="podman build" IMG="${BASE_IMG}:check" make docker-build`