From 59a10526ff50bdbb26346679c6f6acdbbd57a9d8 Mon Sep 17 00:00:00 2001 From: Shettland Date: Thu, 23 May 2024 09:31:53 +0200 Subject: [PATCH 1/2] Separated sftp-handle from other tests, fixed pull-request checkout error --- .github/workflows/test_modules.yml | 60 ++---------------------- .github/workflows/test_sftp_handle.yml | 64 ++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 57 deletions(-) create mode 100644 .github/workflows/test_sftp_handle.yml diff --git a/.github/workflows/test_modules.yml b/.github/workflows/test_modules.yml index 7519c5eb..747c0845 100755 --- a/.github/workflows/test_modules.yml +++ b/.github/workflows/test_modules.yml @@ -3,65 +3,11 @@ name: test_modules on: push: branches: "**" - pull_request_target: + pull_request: types: [opened, reopened, synchronize, closed] branches: "**" jobs: - security_check: - runs-on: ubuntu-latest - steps: - - name: Get User Permission - id: checkAccess - uses: actions-cool/check-user-permission@v2 - with: - require: write - username: ${{ github.triggering_actor }} - - name: Check User Permission - if: steps.checkAccess.outputs.require-result == 'false' - run: | - echo "${{ github.triggering_actor }} does not have permissions on this repo." - echo "Current permission level is ${{ steps.checkAccess.outputs.user-permission }}" - echo "Job originally triggered by ${{ github.actor }}" - exit 1 - - test_sftp_handle: - needs: security_check - concurrency: - group: ${{ github.repository }}-test_sftp_handle - cancel-in-progress: false - runs-on: ubuntu-latest - strategy: - max-parallel: 1 - matrix: - download_options: ["download_only", "download_clean", "delete_only"] - target_folders: ["", "-t COD-test-1"] - - steps: - - name: Set up Python 3.9.16 - uses: actions/setup-python@v3 - with: - python-version: '3.9.16' - - - name: Checkout code - uses: actions/checkout@v3 - with: - path: . - - - name: Install package and dependencies - run: | - pip install -r requirements.txt - pip install . - - - name: Run sftp_handle tests - run: | - python3 tests/test_sftp_handle.py --download_option ${{ matrix.download_options }} ${{ matrix.target_folders }} - env: - TEST_USER: ${{ secrets.TEST_USER }} - TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }} - TEST_PORT: ${{ secrets.TEST_PORT }} - OUTPUT_LOCATION: ${{ github.workspace }}/tests/ - test_map: runs-on: ubuntu-latest strategy: @@ -76,7 +22,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 with: - path: . + ref: ${{ github.event.pull_request.head.sha }} - name: Install package and dependencies run: | pip install -r requirements.txt @@ -108,7 +54,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 with: - path: . + ref: ${{ github.event.pull_request.head.sha }} - name: Install package and dependencies run: | diff --git a/.github/workflows/test_sftp_handle.yml b/.github/workflows/test_sftp_handle.yml new file mode 100644 index 00000000..f1bfc45e --- /dev/null +++ b/.github/workflows/test_sftp_handle.yml @@ -0,0 +1,64 @@ +name: test_sftp_handle + +on: + push: + branches: "**" + pull_request_target: + types: [opened, reopened, synchronize, closed] + branches: "**" + +jobs: + security_check: + runs-on: ubuntu-latest + steps: + - name: Get User Permission + id: checkAccess + uses: actions-cool/check-user-permission@v2 + with: + require: write + username: ${{ github.triggering_actor }} + - name: Check User Permission + if: steps.checkAccess.outputs.require-result == 'false' + run: | + echo "${{ github.triggering_actor }} does not have permissions on this repo." + echo "Current permission level is ${{ steps.checkAccess.outputs.user-permission }}" + echo "Job originally triggered by ${{ github.actor }}" + exit 1 + + test_sftp_handle: + needs: security_check + concurrency: + group: ${{ github.repository }}-test_sftp_handle + cancel-in-progress: false + runs-on: ubuntu-latest + strategy: + max-parallel: 1 + matrix: + download_options: ["download_only", "download_clean", "delete_only"] + target_folders: ["", "-t COD-test-1"] + + steps: + - name: Set up Python 3.9.16 + uses: actions/setup-python@v3 + with: + python-version: '3.9.16' + + - name: Checkout code + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} + + - name: Install package and dependencies + run: | + pip install -r requirements.txt + pip install . + + - name: Run sftp_handle tests + run: | + python3 tests/test_sftp_handle.py --download_option ${{ matrix.download_options }} ${{ matrix.target_folders }} + env: + TEST_USER: ${{ secrets.TEST_USER }} + TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }} + TEST_PORT: ${{ secrets.TEST_PORT }} + OUTPUT_LOCATION: ${{ github.workspace }}/tests/ + \ No newline at end of file From ddcbce2d9be478c50ce6b01280fbf5bf2b145051 Mon Sep 17 00:00:00 2001 From: Shettland Date: Thu, 23 May 2024 09:42:31 +0200 Subject: [PATCH 2/2] Splitted tests, fixed checkout error. Lint --- .github/workflows/test_sftp_handle.yml | 126 ++++++++++++------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/.github/workflows/test_sftp_handle.yml b/.github/workflows/test_sftp_handle.yml index f1bfc45e..6bd72423 100644 --- a/.github/workflows/test_sftp_handle.yml +++ b/.github/workflows/test_sftp_handle.yml @@ -1,64 +1,64 @@ -name: test_sftp_handle - -on: - push: - branches: "**" - pull_request_target: - types: [opened, reopened, synchronize, closed] - branches: "**" - -jobs: - security_check: - runs-on: ubuntu-latest - steps: - - name: Get User Permission - id: checkAccess - uses: actions-cool/check-user-permission@v2 - with: - require: write - username: ${{ github.triggering_actor }} - - name: Check User Permission - if: steps.checkAccess.outputs.require-result == 'false' - run: | - echo "${{ github.triggering_actor }} does not have permissions on this repo." - echo "Current permission level is ${{ steps.checkAccess.outputs.user-permission }}" - echo "Job originally triggered by ${{ github.actor }}" - exit 1 - - test_sftp_handle: - needs: security_check - concurrency: - group: ${{ github.repository }}-test_sftp_handle - cancel-in-progress: false - runs-on: ubuntu-latest - strategy: - max-parallel: 1 - matrix: - download_options: ["download_only", "download_clean", "delete_only"] - target_folders: ["", "-t COD-test-1"] - - steps: - - name: Set up Python 3.9.16 - uses: actions/setup-python@v3 - with: - python-version: '3.9.16' - - - name: Checkout code - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} - - - name: Install package and dependencies - run: | - pip install -r requirements.txt - pip install . - - - name: Run sftp_handle tests - run: | - python3 tests/test_sftp_handle.py --download_option ${{ matrix.download_options }} ${{ matrix.target_folders }} - env: - TEST_USER: ${{ secrets.TEST_USER }} - TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }} - TEST_PORT: ${{ secrets.TEST_PORT }} - OUTPUT_LOCATION: ${{ github.workspace }}/tests/ +name: test_sftp_handle + +on: + push: + branches: "**" + pull_request_target: + types: [opened, reopened, synchronize, closed] + branches: "**" + +jobs: + security_check: + runs-on: ubuntu-latest + steps: + - name: Get User Permission + id: checkAccess + uses: actions-cool/check-user-permission@v2 + with: + require: write + username: ${{ github.triggering_actor }} + - name: Check User Permission + if: steps.checkAccess.outputs.require-result == 'false' + run: | + echo "${{ github.triggering_actor }} does not have permissions on this repo." + echo "Current permission level is ${{ steps.checkAccess.outputs.user-permission }}" + echo "Job originally triggered by ${{ github.actor }}" + exit 1 + + test_sftp_handle: + needs: security_check + concurrency: + group: ${{ github.repository }}-test_sftp_handle + cancel-in-progress: false + runs-on: ubuntu-latest + strategy: + max-parallel: 1 + matrix: + download_options: ["download_only", "download_clean", "delete_only"] + target_folders: ["", "-t COD-test-1"] + + steps: + - name: Set up Python 3.9.16 + uses: actions/setup-python@v3 + with: + python-version: '3.9.16' + + - name: Checkout code + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} + + - name: Install package and dependencies + run: | + pip install -r requirements.txt + pip install . + + - name: Run sftp_handle tests + run: | + python3 tests/test_sftp_handle.py --download_option ${{ matrix.download_options }} ${{ matrix.target_folders }} + env: + TEST_USER: ${{ secrets.TEST_USER }} + TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }} + TEST_PORT: ${{ secrets.TEST_PORT }} + OUTPUT_LOCATION: ${{ github.workspace }}/tests/ \ No newline at end of file