From 3eab2fcf9efe7f50b2cc438d4e925d5c2fecad5a Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 19 May 2023 16:06:11 -0400 Subject: [PATCH 1/6] Use docker for HTTP client --- .github/workflows/smoke-tests.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index c0f90c3..cdf58f1 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -28,15 +28,13 @@ jobs: java-version: 17 - name: Build with Maven run: mvn -B package --file pom.xml -Dmaven.test.skip=true - - name: Download and install HTTP client - run: | - curl -f -L -o ijhttp.zip "https://jb.gg/ijhttp/latest" - unzip ijhttp.zip + - name: Docker Pull HTTP client + run: docker pull jetbrains/intellij-http-client - name: Start server with jetty run: | mvn jetty:run & export JPA_PROCESS=$! sleep 60 - name: Execute smoke tests - run: ./ijhttp/ijhttp ./src/test/smoketest/plain_server.http --env-file ./src/test/smoketest/http-client.env.json --env default + run: docker run --rm -i -t -v $PWD:/workdir jetbrains/intellij-http-client -D src/test/smoketest/plain_server.http --env-file src/test/smoketest/http-client.env.json --env default From 8b7c35c9dc44cc3340634386b68d5a90d1ff0b93 Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 19 May 2023 16:13:49 -0400 Subject: [PATCH 2/6] Try fixing TTY issue --- .github/workflows/smoke-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index cdf58f1..71d3274 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -35,6 +35,6 @@ jobs: mvn jetty:run & export JPA_PROCESS=$! sleep 60 - name: Execute smoke tests - run: docker run --rm -i -t -v $PWD:/workdir jetbrains/intellij-http-client -D src/test/smoketest/plain_server.http --env-file src/test/smoketest/http-client.env.json --env default + run: docker run --rm -v $PWD:/workdir jetbrains/intellij-http-client -D src/test/smoketest/plain_server.http --env-file src/test/smoketest/http-client.env.json --env default From f54088efab6bc745f7a99ae9c1dbc166f5bf9fea Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 19 May 2023 16:17:54 -0400 Subject: [PATCH 3/6] Sleep a little longer... --- .github/workflows/smoke-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 71d3274..1377805 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -33,7 +33,7 @@ jobs: - name: Start server with jetty run: | mvn jetty:run & export JPA_PROCESS=$! - sleep 60 + sleep 80 - name: Execute smoke tests run: docker run --rm -v $PWD:/workdir jetbrains/intellij-http-client -D src/test/smoketest/plain_server.http --env-file src/test/smoketest/http-client.env.json --env default From 9a18b23a26214fcd5512a79967fbe95f73fcb3c6 Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 19 May 2023 16:26:23 -0400 Subject: [PATCH 4/6] Additional param for linux localhost --- .github/workflows/smoke-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 1377805..6fa3560 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -35,6 +35,6 @@ jobs: mvn jetty:run & export JPA_PROCESS=$! sleep 80 - name: Execute smoke tests - run: docker run --rm -v $PWD:/workdir jetbrains/intellij-http-client -D src/test/smoketest/plain_server.http --env-file src/test/smoketest/http-client.env.json --env default + run: docker run --rm -v $PWD:/workdir --add-host host.docker.internal:host-gateway jetbrains/intellij-http-client -D src/test/smoketest/plain_server.http --env-file src/test/smoketest/http-client.env.json --env default From 8bf9dfd1cf4de7967684f0452812109a1691ac62 Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 19 May 2023 16:31:42 -0400 Subject: [PATCH 5/6] Intentional failure --- .github/workflows/smoke-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 6fa3560..3281b72 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -33,7 +33,7 @@ jobs: - name: Start server with jetty run: | mvn jetty:run & export JPA_PROCESS=$! - sleep 80 + sleep 10 - name: Execute smoke tests run: docker run --rm -v $PWD:/workdir --add-host host.docker.internal:host-gateway jetbrains/intellij-http-client -D src/test/smoketest/plain_server.http --env-file src/test/smoketest/http-client.env.json --env default From a2cf95ae5e4fe43951aeed3307b008b9cf13be8f Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 19 May 2023 16:35:48 -0400 Subject: [PATCH 6/6] Restore reasonable sleep time --- .github/workflows/smoke-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 3281b72..6fa3560 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -33,7 +33,7 @@ jobs: - name: Start server with jetty run: | mvn jetty:run & export JPA_PROCESS=$! - sleep 10 + sleep 80 - name: Execute smoke tests run: docker run --rm -v $PWD:/workdir --add-host host.docker.internal:host-gateway jetbrains/intellij-http-client -D src/test/smoketest/plain_server.http --env-file src/test/smoketest/http-client.env.json --env default