From 2e88fb12656cb3501a6862c3e110299b672eb2a5 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 16 May 2024 10:49:00 +0200 Subject: [PATCH 1/4] create test configuration --- tests/collabora.robot | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/collabora.robot b/tests/collabora.robot index 2f6807a..17fd44b 100644 --- a/tests/collabora.robot +++ b/tests/collabora.robot @@ -10,12 +10,11 @@ Check if collabora is installed correctly Set Suite Variable ${module_id} ${output.module_id} Check if collabora can be configured - ${rc} = Execute Command api-cli run module/${module_id}/configure-module --data '{}' - ... return_rc=True return_stdout=False - Should Be Equal As Integers ${rc} 0 - -Check if collabora works as expected - ${rc} = Execute Command curl -f http://127.0.0.1/collabora/ + ${rc} = Execute Command api-cli run module/${module_id}/configure-module --data '{ + "host": "collabora.nethserver.org", + "http2https": true, + "lets_encrypt": true, + "admin_password": "password"}' ... return_rc=True return_stdout=False Should Be Equal As Integers ${rc} 0 From 7427ca21d469011a576ec9ee48ea045c466a242c Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 16 May 2024 10:58:17 +0200 Subject: [PATCH 2/4] Remove obsolete kickstart test case --- tests/kickstart.robot | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 tests/kickstart.robot diff --git a/tests/kickstart.robot b/tests/kickstart.robot deleted file mode 100644 index e1984f0..0000000 --- a/tests/kickstart.robot +++ /dev/null @@ -1,25 +0,0 @@ -*** Settings *** -Library SSHLibrary - -*** Test Cases *** -Check if kickstart is installed correctly - ${output} ${rc} = Execute Command add-module ${IMAGE_URL} 1 - ... return_rc=True - Should Be Equal As Integers ${rc} 0 - &{output} = Evaluate ${output} - Set Suite Variable ${module_id} ${output.module_id} - -Check if kickstart can be configured - ${rc} = Execute Command api-cli run module/${module_id}/configure-module --data '{}' - ... return_rc=True return_stdout=False - Should Be Equal As Integers ${rc} 0 - -Check if kickstart works as expected - ${rc} = Execute Command curl -f http://127.0.0.1/kickstart/ - ... return_rc=True return_stdout=False - Should Be Equal As Integers ${rc} 0 - -Check if kickstart is removed correctly - ${rc} = Execute Command remove-module --no-preserve ${module_id} - ... return_rc=True return_stdout=False - Should Be Equal As Integers ${rc} 0 From b182eeb91fe0661174865e526dc6457ad04e0129 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 16 May 2024 10:58:30 +0200 Subject: [PATCH 3/4] Update image name in clean-registry workflow --- .github/workflows/clean-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clean-registry.yml b/.github/workflows/clean-registry.yml index a0436ee..5dc2e71 100644 --- a/.github/workflows/clean-registry.yml +++ b/.github/workflows/clean-registry.yml @@ -12,5 +12,5 @@ jobs: steps: - uses: NethServer/ns8-github-actions/.github/actions/delete-image@v1 with: - images: "kickstart" + images: "collabora" delete_image_token: ${{ secrets.IMAGES_CLEANUP_TOKEN }} From c4cbe0f30eecc583d29fc502a5da7d4d9213828b Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 16 May 2024 10:58:39 +0200 Subject: [PATCH 4/4] Update test-module.yml to use test-on-digitalocean-infra.yml workflow --- .github/workflows/test-module.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-module.yml b/.github/workflows/test-module.yml index 6f9f6e9..09473dd 100644 --- a/.github/workflows/test-module.yml +++ b/.github/workflows/test-module.yml @@ -17,7 +17,7 @@ jobs: uses: NethServer/ns8-github-actions/.github/workflows/module-info.yml@main run_tests: needs: module - uses: NethServer/ns8-github-actions/.github/workflows/test-on-ubuntu-runner.yml@main + uses: NethServer/ns8-github-actions/.github/workflows/test-on-digitalocean-infra.yml@main with: args: "ghcr.io/${{needs.module.outputs.owner}}/${{needs.module.outputs.name}}:${{needs.module.outputs.tag}}" repo_ref: ${{needs.module.outputs.sha}}