From 1316377b3c8c0554c20c3ab45433b5f67e0b0b9e Mon Sep 17 00:00:00 2001 From: Watchtek Date: Wed, 4 Mar 2026 10:54:09 +0900 Subject: [PATCH 01/10] Change user input on chrome driver --- load_check.py | 61 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/load_check.py b/load_check.py index 68bb714..9fc1226 100644 --- a/load_check.py +++ b/load_check.py @@ -23,20 +23,56 @@ class MultipleTest(unittest.TestCase): def _get_user_inputs(self): """Helper method to get user inputs and set up initial configuration.""" # Test case user input - while True: - print("1. [필수 입력] Chrome 위치 (e.g., /opt/chrome-linux64/chrome, D:\\tmp\\chrome-win64\\chrome.exe): ") - chrome_path = input().strip() - - if not chrome_path: - print("잘못 입력하였습니다. 다시 입력해주세요.\n") - continue - + # while True: + # # Linux Only + if sys.platform.startswith('linux'): # Check if the operating system is Linux + chrome_path = "/usr/bin/google-chrome-stable" if os.path.exists(chrome_path) and os.path.isfile(chrome_path): self.binary_location = chrome_path - break + print("크롬이 이미 설치되어 있습니다.\n다음 입력으로 넘어갑니다.\n") + else: + print("크롬 설치후 스크립트 재실행 바랍니다.\n스크립트를 종료합니다\n") + sys.exit(1) + + else: # is Windows + chrome_path = r"C:\Program Files\Google\Chrome\Application\chrome.exe" + if os.path.exists(chrome_path) and os.path.isfile(chrome_path): + print("기존에 설치된 크롬을 사용하시겠습니까? (y/N): ") + ans = input().strip().lower() + if ans in ("y", "yes"): + self.binary_location = chrome_path + else: + print("크롬 드라이버 위치를 절대경로로 입력해 주세요") + print("1. [필수 입력] Chrome 위치 (e.g., D:\\tmp\\chrome-win64\\chrome.exe): ") + while True: + chrome_path = input().strip() + + if not chrome_path: + print("잘못 입력하였습니다. 다시 입력해주세요.\n") + + if os.path.exists(chrome_path) and os.path.isfile(chrome_path): + self.binary_location = chrome_path + break + + print(f"입력한 경로가 존재하지 않거나 파일이 아닙니다: {chrome_path}") + print("다시 입력해주세요.\n") + + else: + print("크롬이 설치되어 있지 않습니다") + print("크롬 드라이버 위치를 절대경로로 입력해 주세요") + print("1. [필수 입력] Chrome 위치 (e.g., D:\\tmp\\chrome-win64\\chrome.exe): ") + while True: + chrome_path = input().strip() + + if not chrome_path: + print("잘못 입력하였습니다. 다시 입력해주세요.\n") + + if os.path.exists(chrome_path) and os.path.isfile(chrome_path): + self.binary_location = chrome_path + break - print(f"입력한 경로가 존재하지 않거나 파일이 아닙니다: {chrome_path}") - print("다시 입력해주세요.\n") + print(f"입력한 경로가 존재하지 않거나 파일이 아닙니다: {chrome_path}") + print("다시 입력해주세요.\n") print("\n2. [필수 입력] 테스트 대상 웹 (e.g., https://example.com:8443/): ") self.dc_address = input() @@ -48,7 +84,7 @@ class MultipleTest(unittest.TestCase): self.account_configs = [] print("\n3. [필수 입력] 계정유형(1-어드민,2-(지역)관리자,3-사용자) / 계정 접속정보") - print("형식 예시: 1 / admin, admin") + print("입력 예시: 1 / admin, admin") while True: user_input = input("").strip() @@ -83,6 +119,7 @@ class MultipleTest(unittest.TestCase): print("\n5. [선택] 커넥션 수 / 테스트 시간(분)(기본값: 30개 / 120분)") + print("입력 예시: 30 / 120") try: pool_input = input().strip().split('/') self.max_connections = int(pool_input[0].strip()) if pool_input[0].strip() else 30 -- GitLab From 32038574a293422a518d4f080fafa14af160cb59 Mon Sep 17 00:00:00 2001 From: Watchtek Date: Wed, 4 Mar 2026 11:18:39 +0900 Subject: [PATCH 02/10] upgrade `urllib3` version 2.6.3 by trivy --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8983552..97805d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ selenium==4.36.0 -urllib3==2.5.0 +urllib3==2.6.3 requests==2.32.5 \ No newline at end of file -- GitLab From 2663cd5526e01e5055c5c8f307e55e4ca2091f21 Mon Sep 17 00:00:00 2001 From: Watchtek Date: Wed, 4 Mar 2026 13:44:08 +0900 Subject: [PATCH 03/10] package executable file --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2fe374b..c0c3427 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,12 +43,15 @@ variables: - | if [ "$TARGET_OS" = "windows" ]; then mv dist/$DIST_FILE "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64.exe" + zip -v ${BINARY_NAME}.zip "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64.exe" else + chmod +x dist/$DIST_FILE mv dist/$DIST_FILE "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64" + tar czvf ${BINARY_NAME}.tar.gz "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64" fi artifacts: paths: - - "${BINARY_NAME}_*" + - "${BINARY_NAME}.*" expire_in: 1 week rules: - if: '$CI_COMMIT_TAG' @@ -68,7 +71,7 @@ windows_bin: entrypoint: [''] variables: TARGET_OS: "windows" - DIST_FILE: "${BINARY_NAME}.exe" + DIST_FILE: "${BINARY_NAME}.zip" linux_slim_bin: <<: *build_template @@ -77,7 +80,7 @@ linux_slim_bin: entrypoint: [''] variables: TARGET_OS: "linux" - DIST_FILE: "${BINARY_NAME}" + DIST_FILE: "${BINARY_NAME}.tar.gz" release_job: stage: publish -- GitLab From e4f3c5e19c4eda7155a92207c7eb908f18066b4e Mon Sep 17 00:00:00 2001 From: Watchtek Date: Wed, 4 Mar 2026 13:54:04 +0900 Subject: [PATCH 04/10] add indentation on if-else statement --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0c3427..c32569f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,12 +42,12 @@ variables: - export TS=$(date +%Y-%m-%d_%H%M) - | if [ "$TARGET_OS" = "windows" ]; then - mv dist/$DIST_FILE "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64.exe" - zip -v ${BINARY_NAME}.zip "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64.exe" + mv dist/$DIST_FILE "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64.exe" + zip -v ${BINARY_NAME}.zip "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64.exe" else - chmod +x dist/$DIST_FILE - mv dist/$DIST_FILE "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64" - tar czvf ${BINARY_NAME}.tar.gz "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64" + chmod +x dist/$DIST_FILE + mv dist/$DIST_FILE "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64" + tar czvf ${BINARY_NAME}.tar.gz "${BINARY_NAME}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}_${TS}_${TARGET_OS}_amd64" fi artifacts: paths: -- GitLab From 7d92e9c16f98c3633fbc640ba19e15e3980bc8d6 Mon Sep 17 00:00:00 2001 From: Watchtek Date: Wed, 4 Mar 2026 14:03:48 +0900 Subject: [PATCH 05/10] revert `DIST_FILE` and release compressed files --- .gitlab-ci.yml | 4 ++-- scripts/release.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c32569f..3d4a60b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ windows_bin: entrypoint: [''] variables: TARGET_OS: "windows" - DIST_FILE: "${BINARY_NAME}.zip" + DIST_FILE: "${BINARY_NAME}.exe" linux_slim_bin: <<: *build_template @@ -80,7 +80,7 @@ linux_slim_bin: entrypoint: [''] variables: TARGET_OS: "linux" - DIST_FILE: "${BINARY_NAME}.tar.gz" + DIST_FILE: "${BINARY_NAME}" release_job: stage: publish diff --git a/scripts/release.sh b/scripts/release.sh index 564ec4b..b4f8f42 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -81,14 +81,14 @@ for f in release_files/*; do sha_file="${f}.sha256" sha256sum "$f" > "$sha_file" - upload_and_add_json "$f" "Windows binary" + upload_and_add_json "*.zip" "Windows binary (Compressed)" upload_and_add_json "$sha_file" "Windows binary checksum" ;; *linux_amd64) sha_file="${f}.sha256" sha256sum "$f" > "$sha_file" - upload_and_add_json "$f" "Linux binary" + upload_and_add_json "*.tar.gz" "Linux binary (Compressed)" upload_and_add_json "$sha_file" "Linux binary checksum" ;; esac -- GitLab From 187d3b6edd0f2696210fa8aff7080c18cfd8c1fb Mon Sep 17 00:00:00 2001 From: Watchtek Date: Wed, 4 Mar 2026 14:10:27 +0900 Subject: [PATCH 06/10] solved zip dependancy --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d4a60b..8fc234f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,8 @@ windows_bin: image: name: batonogov/pyinstaller-windows:latest entrypoint: [''] + before_script: + - apt install -y zip variables: TARGET_OS: "windows" DIST_FILE: "${BINARY_NAME}.exe" -- GitLab From 3485ac37ada6e1c69fb389d5e66bbae066f570e6 Mon Sep 17 00:00:00 2001 From: Watchtek Date: Wed, 4 Mar 2026 14:13:41 +0900 Subject: [PATCH 07/10] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8fc234f..578f15c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,7 +70,7 @@ windows_bin: name: batonogov/pyinstaller-windows:latest entrypoint: [''] before_script: - - apt install -y zip + - apt-get update && apt-get install -y zip variables: TARGET_OS: "windows" DIST_FILE: "${BINARY_NAME}.exe" -- GitLab From 2c58b4634fde54482d16544be44b4032619a517a Mon Sep 17 00:00:00 2001 From: Watchtek Date: Wed, 4 Mar 2026 14:18:24 +0900 Subject: [PATCH 08/10] add artifacts bianry and compressed file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 578f15c..225ebcb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,6 +51,7 @@ variables: fi artifacts: paths: + - "${BINARY_NAME}_*" - "${BINARY_NAME}.*" expire_in: 1 week rules: -- GitLab From 842fefd0af426b11f3d2dca58a1f54513271c884 Mon Sep 17 00:00:00 2001 From: Watchtek Date: Wed, 4 Mar 2026 14:32:33 +0900 Subject: [PATCH 09/10] Update 2 files - /.gitlab-ci.yml - /scripts/release.sh --- .gitlab-ci.yml | 7 ++++++- scripts/release.sh | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 225ebcb..a16903a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,6 @@ variables: artifacts: paths: - "${BINARY_NAME}_*" - - "${BINARY_NAME}.*" expire_in: 1 week rules: - if: '$CI_COMMIT_TAG' @@ -72,6 +71,9 @@ windows_bin: entrypoint: [''] before_script: - apt-get update && apt-get install -y zip + artifacts: + paths: + - "${BINARY_NAME}.zip" variables: TARGET_OS: "windows" DIST_FILE: "${BINARY_NAME}.exe" @@ -81,6 +83,9 @@ linux_slim_bin: image: name: batonogov/pyinstaller-linux:latest-slim entrypoint: [''] + artifacts: + paths: + - "${BINARY_NAME}.tar.gz" variables: TARGET_OS: "linux" DIST_FILE: "${BINARY_NAME}" diff --git a/scripts/release.sh b/scripts/release.sh index b4f8f42..82a5292 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -43,6 +43,8 @@ mkdir -p release_files echo "🔍 Collecting build artifacts for commit $CI_COMMIT_SHORT_SHA ..." cp ./*_"${CI_COMMIT_SHORT_SHA}"_* release_files/ 2>/dev/null || true +cp ./"${BINARY_NAME}.zip" release_files/ 2>/dev/null || true +cp ./"${BINARY_NAME}.tar.gz" release_files/ 2>/dev/null || true if [ -z "$(ls -A release_files 2>/dev/null)" ]; then echo "❌ No artifacts found matching pattern '*_${CI_COMMIT_SHORT_SHA}_*'" @@ -81,14 +83,14 @@ for f in release_files/*; do sha_file="${f}.sha256" sha256sum "$f" > "$sha_file" - upload_and_add_json "*.zip" "Windows binary (Compressed)" + upload_and_add_json "${BINARY_NAME}.zip" "Windows binary (Compressed)" upload_and_add_json "$sha_file" "Windows binary checksum" ;; *linux_amd64) sha_file="${f}.sha256" sha256sum "$f" > "$sha_file" - upload_and_add_json "*.tar.gz" "Linux binary (Compressed)" + upload_and_add_json "${BINARY_NAME}.tar.gz" "Linux binary (Compressed)" upload_and_add_json "$sha_file" "Linux binary checksum" ;; esac -- GitLab From 606fb3b73773dc242c2e7abf81302d7d137c20ac Mon Sep 17 00:00:00 2001 From: Watchtek Date: Thu, 5 Mar 2026 00:12:32 +0900 Subject: [PATCH 10/10] add more artifacts --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a16903a..9c2c117 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,6 +73,7 @@ windows_bin: - apt-get update && apt-get install -y zip artifacts: paths: + - "${BINARY_NAME}_*" - "${BINARY_NAME}.zip" variables: TARGET_OS: "windows" @@ -85,6 +86,7 @@ linux_slim_bin: entrypoint: [''] artifacts: paths: + - "${BINARY_NAME}_*" - "${BINARY_NAME}.tar.gz" variables: TARGET_OS: "linux" -- GitLab