diff --git a/.github/workflows/pr-kind.yml b/.github/workflows/pr-kind.yml index 82f39c7b..c1be638a 100644 --- a/.github/workflows/pr-kind.yml +++ b/.github/workflows/pr-kind.yml @@ -135,7 +135,6 @@ jobs: kind-test-podman-rootless-linux: name: Deploy Podman Rootless Linux - if: false runs-on: ${{ matrix.os }} env: IngressHTTPPort: 30080 @@ -164,17 +163,11 @@ jobs: - name: Check that ingress is available run: | set +e - CURL_EXIT_CODE=$(curl -o /dev/null -s -w "%{exitcode}\n" http://localhost:$IngressHTTPPort/) + CURL_EXIT_CODE=$(curl --insecure -o /dev/null -s -w "%{exitcode}\n" https://localhost:$IngressHTTPSPort) if [ ! "${CURL_EXIT_CODE}" == '0' ]; then echo "Exit code should have been 0 but it was ${CURL_EXIT_CODE}." curl -o /dev/null -s -w "%{http_code}\n" http://localhost:$IngressHTTPPort curl -o /dev/null -s -w "%{exitcode}\n" http://localhost:$IngressHTTPPort - curl -o /dev/null -s -w "%{http_code}\n" https://localhost:$IngressHTTPSPort --insecure - curl -o /dev/null -s -w "%{exitcode}\n" https://localhost:$IngressHTTPSPort --insecure - echo "Not going to fail as rootless containers still don't work with podman." - exit 0 - else - echo "If rootless containers now work must review this workflow." exit 1 fi @@ -214,17 +207,11 @@ jobs: - name: Check that ingress is available run: | set +e - CURL_EXIT_CODE=$(curl -o /dev/null -s -w "%{exitcode}\n" http://localhost:$IngressHTTPPort/) + CURL_EXIT_CODE=$(curl -o /dev/null -s -w "%{exitcode}\n" http://localhost:$IngressHTTPPort) if [ ! "${CURL_EXIT_CODE}" == '0' ]; then echo "Exit code should have been 0 but it was ${CURL_EXIT_CODE}." curl -o /dev/null -s -w "%{http_code}\n" http://localhost:$IngressHTTPPort curl -o /dev/null -s -w "%{exitcode}\n" http://localhost:$IngressHTTPPort - curl -o /dev/null -s -w "%{http_code}\n" https://localhost:$IngressHTTPSPort --insecure - curl -o /dev/null -s -w "%{exitcode}\n" https://localhost:$IngressHTTPSPort --insecure - echo "Not going to fail as rootless containers still don't work with podman." - exit 0 - else - echo "If rootless containers now work must review this workflow." exit 1 fi @@ -267,6 +254,7 @@ jobs: kind-test-podman-rootful-macos: name: Deploy Podman Rootful MacOS + if: false runs-on: ${{ matrix.os }} env: IngressHTTPPort: 80