From 5de2248b021d0ccdbddc3d7e7bd226c3ab3162de Mon Sep 17 00:00:00 2001 From: Jacob Boddey Date: Tue, 2 Jan 2024 15:01:30 +0000 Subject: [PATCH 1/4] Test permissions --- .github/workflows/testing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 4071860f5..a0557a95b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -7,6 +7,7 @@ on: jobs: testrun_baseline: + permissions: {} name: Baseline runs-on: ubuntu-20.04 timeout-minutes: 20 From 35ff0380380eee89ac34851fdda34c2b9316379f Mon Sep 17 00:00:00 2001 From: Jacob Boddey Date: Tue, 2 Jan 2024 15:11:58 +0000 Subject: [PATCH 2/4] Set all permissions --- .github/workflows/testing.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index a0557a95b..2b9269437 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -29,6 +29,7 @@ jobs: run: testing/baseline/test_baseline testrun_tests: + permissions: {} name: Tests runs-on: ubuntu-20.04 needs: testrun_baseline @@ -60,6 +61,7 @@ jobs: path: runtime.tgz testrun_api: + permissions: {} name: API runs-on: ubuntu-20.04 timeout-minutes: 40 @@ -91,6 +93,7 @@ jobs: path: runtime.tgz pylint: + permissions: {} name: Pylint runs-on: ubuntu-22.04 timeout-minutes: 5 @@ -102,6 +105,7 @@ jobs: run: testing/pylint/test_pylint testrun_package: + permissions: {} name: Package runs-on: ubuntu-22.04 timeout-minutes: 5 @@ -118,6 +122,7 @@ jobs: path: testrun*.deb testrun_ui: + permissions: {} name: UI runs-on: ubuntu-latest steps: From 29265fa8bcfb121fd8c4dd5a03914214cd83145e Mon Sep 17 00:00:00 2001 From: Jacob Boddey Date: Tue, 2 Jan 2024 15:17:04 +0000 Subject: [PATCH 3/4] Update package versions --- .github/workflows/testing.yml | 20 ++++++++++---------- local/system.json.example | 9 ++++++++- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 2b9269437..bca25d9d1 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -13,7 +13,7 @@ jobs: timeout-minutes: 20 steps: - name: Checkout source - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 - name: Install dependencies shell: bash {0} run: cmd/prepare @@ -36,7 +36,7 @@ jobs: timeout-minutes: 45 steps: - name: Checkout source - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 - name: Install dependencies shell: bash {0} run: cmd/prepare @@ -53,7 +53,7 @@ jobs: if: ${{ always() }} run: sudo tar --exclude-vcs -czf runtime.tgz /usr/local/testrun/runtime/ - name: Upload runtime results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: if-no-files-found: error @@ -67,7 +67,7 @@ jobs: timeout-minutes: 40 steps: - name: Checkout source - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 - name: Install dependencies shell: bash {0} run: cmd/prepare @@ -85,7 +85,7 @@ jobs: if: ${{ always() }} run: sudo tar --exclude-vcs -czf runtime.tgz /usr/local/testrun/runtime/ /usr/local/testrun/local/ - name: Upload runtime results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: if-no-files-found: error @@ -99,7 +99,7 @@ jobs: timeout-minutes: 5 steps: - name: Checkout source - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 - name: Run pylint shell: bash {0} run: testing/pylint/test_pylint @@ -111,12 +111,12 @@ jobs: timeout-minutes: 5 steps: - name: Checkout source - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 - name: Package Testrun shell: bash {0} run: cmd/package - name: Archive package - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Testrun Installer path: testrun*.deb @@ -126,9 +126,9 @@ jobs: name: UI runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4.1.1 - name: Install Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 18.10.0 - name: Install Chromium Browser diff --git a/local/system.json.example b/local/system.json.example index d2f398b24..bfbcfdf5f 100644 --- a/local/system.json.example +++ b/local/system.json.example @@ -6,5 +6,12 @@ "log_level": "INFO", "startup_timeout": 60, "monitor_period": 300, - "max_device_reports": 5 + "max_device_reports": 5, + "switch": { + "host": "10.10.10.10", + "ssh_port": 22, + "username": "root", + "password": "Password123", + "device_intf": "eth1" + } } From a8e6773169eb6b68b795e3098dec9f4b3548590d Mon Sep 17 00:00:00 2001 From: Jacob Boddey Date: Tue, 2 Jan 2024 20:58:46 +0000 Subject: [PATCH 4/4] Rename artifacts --- .github/workflows/testing.yml | 6 +++--- local/system.json.example | 9 +-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index bca25d9d1..dcc5a2cfe 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -57,7 +57,7 @@ jobs: if: ${{ always() }} with: if-no-files-found: error - name: runtime_${{ github.workflow }}_${{ github.run_id }} + name: runtime_tests_${{ github.run_id }} path: runtime.tgz testrun_api: @@ -89,7 +89,7 @@ jobs: if: ${{ always() }} with: if-no-files-found: error - name: runtime_${{ github.workflow }}_${{ github.run_id }} + name: runtime_api_${{ github.run_id }} path: runtime.tgz pylint: @@ -118,7 +118,7 @@ jobs: - name: Archive package uses: actions/upload-artifact@v4 with: - name: Testrun Installer + name: testrun_installer path: testrun*.deb testrun_ui: diff --git a/local/system.json.example b/local/system.json.example index bfbcfdf5f..d2f398b24 100644 --- a/local/system.json.example +++ b/local/system.json.example @@ -6,12 +6,5 @@ "log_level": "INFO", "startup_timeout": 60, "monitor_period": 300, - "max_device_reports": 5, - "switch": { - "host": "10.10.10.10", - "ssh_port": 22, - "username": "root", - "password": "Password123", - "device_intf": "eth1" - } + "max_device_reports": 5 }