From d1a516a7ed0ff1d9f807e52bbeaed92a5556c54d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 28 Feb 2020 00:02:06 +0100 Subject: [PATCH 1/5] added autowizard as test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .github/ auto_wizard.json | 31 +++++++++++++++++++++++++++++++ .github/tests.sh | 5 +++++ .github/workflows/ci.yaml | 4 ++-- 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 .github/ auto_wizard.json diff --git a/.github/ auto_wizard.json b/.github/ auto_wizard.json new file mode 100644 index 0000000..90852bb --- /dev/null +++ b/.github/ auto_wizard.json @@ -0,0 +1,31 @@ +{ + "Token": "docker_compose_token", + "TextModuleLocale": { + "Locale": "en-us" + }, + "Users": [ + { + "login": "info@zammad.org", + "firstname": "Zam", + "lastname": "Mad", + "email": "info@zammad.org", + "organization": "Zammad", + "password": "Zammad" + } + ], + "Settings": [ + { + "name": "product_name", + "value": "Zammad Service Desk" + }, + { + "name": "system_online_service", + "value": true + } + ], + "Organizations": [ + { + "name": "Zammad" + } + ] +} \ No newline at end of file diff --git a/.github/tests.sh b/.github/tests.sh index 728e5bb..dec8af0 100755 --- a/.github/tests.sh +++ b/.github/tests.sh @@ -18,3 +18,8 @@ sleep 30 echo echo "Success - Zammad is up :)" echo +echo "Execute autowizard..." + +curl -I --silent --fail --show-error "http://localhost/#getting_started/auto_wizard/docker_compose_token" > /dev/null + +echo "autowizard executed successful" \ No newline at end of file diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fecb75c..f298168 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -44,7 +44,7 @@ jobs: run: docker-compose pull - name: run docker-compose up run: docker-compose up --detach + - name: add autowizard file + run: docker cp .github/auto_wizard.json zammad-docker-compose_zammad-railsserver_1:/opt/zammad - name: run tests run: .github/tests.sh - - From 4ef5d6366fdecb272a664cad0213a15d6c4a092d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 28 Feb 2020 00:06:46 +0100 Subject: [PATCH 2/5] fix filename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .github/{ auto_wizard.json => auto_wizard.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ auto_wizard.json => auto_wizard.json} (100%) diff --git a/.github/ auto_wizard.json b/.github/auto_wizard.json similarity index 100% rename from .github/ auto_wizard.json rename to .github/auto_wizard.json From eb0e5980d46ede0214960df8ce617364130f4ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 28 Feb 2020 00:08:26 +0100 Subject: [PATCH 3/5] removed workflow needs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .github/workflows/ci.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f298168..6c4ec94 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,6 @@ jobs: lint-docker-files: runs-on: ubuntu-latest - needs: lint-bash-scripts steps: - name: Checkout uses: actions/checkout@v1 @@ -36,7 +35,6 @@ jobs: test-docker-compose: timeout-minutes: 10 runs-on: ubuntu-latest - needs: lint-docker-files steps: - name: Checkout uses: actions/checkout@v1 From 4b1b1902197a6d1a6935928f011e4cf6cb8a8e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 28 Feb 2020 00:17:56 +0100 Subject: [PATCH 4/5] added another sleep to see some more logs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .github/tests.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/tests.sh b/.github/tests.sh index dec8af0..32e0ad1 100755 --- a/.github/tests.sh +++ b/.github/tests.sh @@ -22,4 +22,6 @@ echo "Execute autowizard..." curl -I --silent --fail --show-error "http://localhost/#getting_started/auto_wizard/docker_compose_token" > /dev/null -echo "autowizard executed successful" \ No newline at end of file +sleep 30 + +echo "Autowizard executed successful" \ No newline at end of file From b075bd1a8fa2d306fa5c630fa9491449c6b71e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 28 Feb 2020 00:38:31 +0100 Subject: [PATCH 5/5] remove sleep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .github/tests.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/tests.sh b/.github/tests.sh index 32e0ad1..e3d44fd 100755 --- a/.github/tests.sh +++ b/.github/tests.sh @@ -19,9 +19,11 @@ echo echo "Success - Zammad is up :)" echo echo "Execute autowizard..." +echo curl -I --silent --fail --show-error "http://localhost/#getting_started/auto_wizard/docker_compose_token" > /dev/null -sleep 30 +echo +echo "Autowizard executed successful" +echo -echo "Autowizard executed successful" \ No newline at end of file