From e26ff0e35b5dd9d4f2c606b3a4c37985eac81dfa Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Fri, 14 Jun 2024 15:48:49 +0200 Subject: [PATCH] [bitnami/matomo] Fix tests for Matomo 5.1.0 Signed-off-by: Miguel Ruiz --- .vib/matomo/goss/goss.yaml | 1 + .vib/matomo/goss/matomo.yaml | 11 ++--------- .vib/matomo/goss/vars.yaml | 3 +++ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.vib/matomo/goss/goss.yaml b/.vib/matomo/goss/goss.yaml index de0f1357636d9..92c603b7b9cea 100644 --- a/.vib/matomo/goss/goss.yaml +++ b/.vib/matomo/goss/goss.yaml @@ -5,6 +5,7 @@ gossfile: # Goss tests exclusive to the current container ../../matomo/goss/matomo.yaml: {} # Load scripts from .vib/common/goss/templates + ../../common/goss/templates/check-app-version.yaml: {} ../../common/goss/templates/check-apache-libphp.yaml: {} ../../common/goss/templates/check-binaries.yaml: {} ../../common/goss/templates/check-broken-symlinks.yaml: {} diff --git a/.vib/matomo/goss/matomo.yaml b/.vib/matomo/goss/matomo.yaml index e3e73fd16b22d..86cc40c3a6d90 100644 --- a/.vib/matomo/goss/matomo.yaml +++ b/.vib/matomo/goss/matomo.yaml @@ -33,15 +33,8 @@ file: /opt/bitnami/matomo/.buildcomplete: exists: false command: - # Since it is not done with sudo, the exit code is 1 - check-app-version: - exec: php /opt/bitnami/matomo/console --version - exit-status: 1 - stdout: - - "{{ .Env.APP_VERSION }}" - # Since it is not done with sudo, the exit code is 1 check-app-run: exec: php /opt/bitnami/matomo/console config:get --section=database - exit-status: 1 + exit-status: 0 stdout: - - "Mysql" \ No newline at end of file + - "Mysql" diff --git a/.vib/matomo/goss/vars.yaml b/.vib/matomo/goss/vars.yaml index d370f23931e44..669a62f009334 100644 --- a/.vib/matomo/goss/vars.yaml +++ b/.vib/matomo/goss/vars.yaml @@ -19,4 +19,7 @@ files: - paths: - /opt/bitnami/matomo/piwik.js - /opt/bitnami/matomo/piwik.php +version: + bin_name: php /opt/bitnami/matomo/console + flag: --version root_dir: /opt/bitnami