From a450c651b993389e323dc8d60be6e12908c27611 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 11 Mar 2024 14:35:04 +0800 Subject: [PATCH 1/5] test R clients in node4 of circleci --- .circleci/config.yml | 15 +++++++++++++++ CI/circle_parallel.sh | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1358ee786531..71098116b4c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -192,6 +192,20 @@ jobs: - checkout - command_build_and_test: nodeNo: "3" + node4: + machine: + image: ubuntu-2004:202201-02 + working_directory: ~/OpenAPITools/openapi-generator + shell: /bin/bash --login + environment: + CIRCLE_ARTIFACTS: /tmp/circleci-artifacts + CIRCLE_TEST_REPORTS: /tmp/circleci-test-results + DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator + DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli + steps: + - checkout + - command_build_and_test: + nodeNo: "4" workflows: version: 2 build: @@ -200,3 +214,4 @@ workflows: - node1 - node2 - node3 + - node4 diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 9be0f79cf9cf..5f992d569e5b 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -93,6 +93,15 @@ elif [ "$NODE_INDEX" = "3" ]; then (cd samples/client/petstore/javascript-es6 && mvn integration-test) (cd samples/client/petstore/javascript-promise-es6 && mvn integration-test) +elif [ "$NODE_INDEX" = "4" ]; then + echo "Running node $NODE_INDEX ..." + + sudo apt install r-base r-base-dev -y + + (cd samples/openapi3/client/petstore/R && mvn integration-test) + (cd samples/openapi3/client/petstore/R-httpr2 && mvn integration-test) + (cd samples/openapi3/client/petstore/R-httpr2-wrapper && mvn integration-test) + else echo "Running node $NODE_INDEX ..." java -version From 8e8e16e1369f2dd1bb785e51ba448bd92835bb51 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 11 Mar 2024 14:40:20 +0800 Subject: [PATCH 2/5] fix dir --- CI/circle_parallel.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 5f992d569e5b..a1fcf003efde 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -98,9 +98,9 @@ elif [ "$NODE_INDEX" = "4" ]; then sudo apt install r-base r-base-dev -y - (cd samples/openapi3/client/petstore/R && mvn integration-test) - (cd samples/openapi3/client/petstore/R-httpr2 && mvn integration-test) - (cd samples/openapi3/client/petstore/R-httpr2-wrapper && mvn integration-test) + (cd samples/client/petstore/R && mvn integration-test) + (cd samples/client/petstore/R-httpr2 && mvn integration-test) + (cd samples/client/petstore/R-httpr2-wrapper && mvn integration-test) else echo "Running node $NODE_INDEX ..." From 474325a9e55c7a0dd6fc65ba7ee7cc44f47016b9 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 11 Mar 2024 15:33:40 +0800 Subject: [PATCH 3/5] update install --- CI/circle_parallel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index a1fcf003efde..89bd87e4162f 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -97,6 +97,7 @@ elif [ "$NODE_INDEX" = "4" ]; then echo "Running node $NODE_INDEX ..." sudo apt install r-base r-base-dev -y + sudo apt-get install r-base-core libssl-dev libcurl4-openssl-dev -y # for httr (cd samples/client/petstore/R && mvn integration-test) (cd samples/client/petstore/R-httpr2 && mvn integration-test) From da2401a5202bcbb92a2c5900e23c7ef17e3ca49c Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 13 Mar 2024 14:59:05 +0800 Subject: [PATCH 4/5] skip test --- CI/circle_parallel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 89bd87e4162f..4e85bbd2c5c5 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -99,7 +99,7 @@ elif [ "$NODE_INDEX" = "4" ]; then sudo apt install r-base r-base-dev -y sudo apt-get install r-base-core libssl-dev libcurl4-openssl-dev -y # for httr - (cd samples/client/petstore/R && mvn integration-test) + #(cd samples/client/petstore/R && mvn integration-test) (cd samples/client/petstore/R-httpr2 && mvn integration-test) (cd samples/client/petstore/R-httpr2-wrapper && mvn integration-test) From 1bc19c694e7530ab220ca8cc3fad87fc31cd5fcd Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 13 Mar 2024 15:07:03 +0800 Subject: [PATCH 5/5] fix dir --- CI/circle_parallel.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 4e85bbd2c5c5..c43861ee8152 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -100,8 +100,8 @@ elif [ "$NODE_INDEX" = "4" ]; then sudo apt-get install r-base-core libssl-dev libcurl4-openssl-dev -y # for httr #(cd samples/client/petstore/R && mvn integration-test) - (cd samples/client/petstore/R-httpr2 && mvn integration-test) - (cd samples/client/petstore/R-httpr2-wrapper && mvn integration-test) + (cd samples/client/petstore/R-httr2 && mvn integration-test) + (cd samples/client/petstore/R-httr2-wrapper && mvn integration-test) else echo "Running node $NODE_INDEX ..."