From 9faf0f5da265e2a7420ba5a06f35ecaf82bb39f8 Mon Sep 17 00:00:00 2001 From: "KEYSIGHT\\ziliyeoh" Date: Thu, 18 Jul 2024 11:29:16 +0800 Subject: [PATCH 1/5] Update DAI version support 7.4.0-3 --- README.md | 14 +++++--------- action.yml | 14 ++------------ 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index ecbfb55..4c67c96 100644 --- a/README.md +++ b/README.md @@ -100,14 +100,6 @@ The **DAI Client Secret** can be obtained by go to `http(s):/dai_server_hostname **[Optional]** The exponential backoff factor between each HTTP request.
**Default:** `0.5` -### `pollInterval` -**[Optional]** The number of seconds to wait between each call to the Eggplant DAI server.
-**Default:** `5` - -### `testEnvironmentTimeout` -**[Optional]** The timeout in seconds for checking test environment readiness.
-**Default:** `15` - ### `logLevel` **[Optional]** The logging level.
**Default:** `INFO` @@ -141,9 +133,13 @@ Based on the pipeline .yml configuration, when there is commits or pull request - 7.3.0-3 + 7.4.0-3 latest + + 7.3.0-3 + v1.0.11 + 7.2.0-4 v1.0.10 diff --git a/action.yml b/action.yml index 34015cf..5d75ee6 100644 --- a/action.yml +++ b/action.yml @@ -38,16 +38,6 @@ inputs: required: false type: float default: 0.5 - pollInterval: - description: "The number of seconds to wait between each call to the Eggplant DAI server [default: 5]" - required: false - type: integer - default: 5 - testEnvironmentTimeout: - description: "The timeout in seconds for checking test environment readiness [default: 15]" - required: false - type: integer - default: 15 logLevel: description: "The logging level [default: INFO]" required: false @@ -95,7 +85,7 @@ runs: echo "DOWNLOAD_URL=https://downloads.eggplantsoftware.com/downloads/EggplantRunner/$EXE_FILENAME" >> $GITHUB_ENV shell: bash env: - DAI_VERSION: 7.3.0-3 # AUB-13519_CICD_Junit_file_implementation + DAI_VERSION: 7.4.0-3 # AUB-13519_CICD_Junit_file_implementation - name: Fetch CLI if: ${{ inputs.eggplantRunnerPath }} @@ -211,7 +201,7 @@ runs: COMMANDSTR+=" --client-id=${{ inputs.clientID }}" fi - COMMANDSTR+=" --request-timeout=${{ inputs.requestTimeout }} --request-retries=${{ inputs.requestRetries }} --backoff-factor=${{ inputs.backoffFactor }} --poll-interval=${{ inputs.pollInterval }} --test-environment-timeout=${{ inputs.testEnvironmentTimeout }} --log-level=${{ inputs.logLevel }}" + COMMANDSTR+=" --request-timeout=${{ inputs.requestTimeout }} --request-retries=${{ inputs.requestRetries }} --backoff-factor=${{ inputs.backoffFactor }} --log-level=${{ inputs.logLevel }}" if [ -n "${{ inputs.CACertPath }}" ]; then if [ ! -e "${{ inputs.CACertPath }}" ]; then From 9b585e19d3878da7ef6f9e9988c547beabbb7581 Mon Sep 17 00:00:00 2001 From: "KEYSIGHT\\ziliyeoh" Date: Tue, 23 Jul 2024 10:02:32 +0800 Subject: [PATCH 2/5] Update DAI version support 7.4.0-4 --- README.md | 2 +- action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4c67c96..b48f34f 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ Based on the pipeline .yml configuration, when there is commits or pull request - 7.4.0-3 + 7.4.0-4 latest diff --git a/action.yml b/action.yml index 5d75ee6..62fe7b6 100644 --- a/action.yml +++ b/action.yml @@ -82,7 +82,7 @@ runs: fi echo "CLI_FILENAME=$EXE_FILENAME" >> $GITHUB_ENV echo "DAI_VERSION=$DAI_VERSION" >> $GITHUB_ENV - echo "DOWNLOAD_URL=https://downloads.eggplantsoftware.com/downloads/EggplantRunner/$EXE_FILENAME" >> $GITHUB_ENV + echo "DOWNLOAD_URL=https://assets.eggplantsoftware.com/EggplantRunner/$EXE_FILENAME" >> $GITHUB_ENV shell: bash env: DAI_VERSION: 7.4.0-3 # AUB-13519_CICD_Junit_file_implementation From 38b46cf6d4ca47ab4e748f1df3afbe8c91703215 Mon Sep 17 00:00:00 2001 From: "KEYSIGHT\\ziliyeoh" Date: Tue, 23 Jul 2024 10:04:49 +0800 Subject: [PATCH 3/5] fix version --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 62fe7b6..545cf66 100644 --- a/action.yml +++ b/action.yml @@ -85,7 +85,7 @@ runs: echo "DOWNLOAD_URL=https://assets.eggplantsoftware.com/EggplantRunner/$EXE_FILENAME" >> $GITHUB_ENV shell: bash env: - DAI_VERSION: 7.4.0-3 # AUB-13519_CICD_Junit_file_implementation + DAI_VERSION: 7.4.0-4 # AUB-13519_CICD_Junit_file_implementation - name: Fetch CLI if: ${{ inputs.eggplantRunnerPath }} From cfe0818323d99c8870b9745522e0b55733b0fab0 Mon Sep 17 00:00:00 2001 From: "KEYSIGHT\\ziliyeoh" Date: Thu, 25 Jul 2024 14:39:38 +0800 Subject: [PATCH 4/5] get status code --- action.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 545cf66..729d3ae 100644 --- a/action.yml +++ b/action.yml @@ -149,8 +149,10 @@ runs: # Public URL download mkdir -p "$CLI_DIR" echo "Downloading $DOWNLOAD_URL..." - code="$(curl -L $DOWNLOAD_URL --write-out %{http_code} --silent --output "$CLI_DIR/$CLI_FILENAME" )" - if [ $code -ne 200 ]; then + code=$(curl -I -s -L "$DOWNLOAD_URL" | awk '/HTTP\/1.1/ {print $2}') + if [ $code -eq 200 ]; then + curl -L "$DOWNLOAD_URL" --silent --output "$CLI_DIR/$CLI_FILENAME" + else echo "Error: Download failed. Unable to download from url: $DOWNLOAD_URL. Error details: HTTP Error $code"; exit 1; fi echo "CLI_PATH=$CLI_DIR/$CLI_FILENAME" >> $GITHUB_ENV From 23ba4df923184c5b7da71546296378206bd842b8 Mon Sep 17 00:00:00 2001 From: "KEYSIGHT\\ziliyeoh" Date: Thu, 8 Aug 2024 09:05:34 +0800 Subject: [PATCH 5/5] update readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b48f34f..5550916 100644 --- a/README.md +++ b/README.md @@ -193,6 +193,9 @@ Hence, we can only do unilateral testing. - Windows - MacOS + +4. Starting from v1.0.12 (DAI 7.4.0-4) onwards, Inputs `pollInterval` and `testEnvironmentTimeout` were removed. Warnings are expected if inputs are still in the workflow file. + # License The scripts and documentation in this project are released under the [MIT License](LICENSE)