From eb2955a86e86baddd8369dce1b99223992e005eb Mon Sep 17 00:00:00 2001 From: Marcos Bjoerkelund Date: Wed, 24 May 2023 16:13:21 +0200 Subject: [PATCH] [bitnami/osclass] Add VIB tests (#33417) Signed-off-by: Marcos Bjoerkelund --- .vib/osclass/goss/goss.yaml | 13 +++++++++++++ .vib/osclass/goss/osclass.yaml | 35 ++++++++++++++++++++++++++++++++++ .vib/osclass/goss/vars.yaml | 19 ++++++++++++++++++ .vib/osclass/vib-publish.json | 18 ++++++++++++++++- .vib/osclass/vib-verify.json | 18 ++++++++++++++++- 5 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 .vib/osclass/goss/goss.yaml create mode 100644 .vib/osclass/goss/osclass.yaml create mode 100644 .vib/osclass/goss/vars.yaml diff --git a/.vib/osclass/goss/goss.yaml b/.vib/osclass/goss/goss.yaml new file mode 100644 index 000000000000..0d719ec71e6e --- /dev/null +++ b/.vib/osclass/goss/goss.yaml @@ -0,0 +1,13 @@ +gossfile: + # Goss tests exclusive to the current container + ../../osclass/goss/osclass.yaml: {} + # Load scripts from .vib/common/goss/templates + ../../common/goss/templates/check-apache-libphp.yaml: {} + ../../common/goss/templates/check-binaries.yaml: {} + ../../common/goss/templates/check-broken-symlinks.yaml: {} + ../../common/goss/templates/check-ca-certs.yaml: {} + ../../common/goss/templates/check-directories.yaml: {} + ../../common/goss/templates/check-files.yaml: {} + ../../common/goss/templates/check-linked-libraries.yaml: {} + ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/osclass/goss/osclass.yaml b/.vib/osclass/goss/osclass.yaml new file mode 100644 index 000000000000..2c61402e53a0 --- /dev/null +++ b/.vib/osclass/goss/osclass.yaml @@ -0,0 +1,35 @@ +command: + check-app-version: + exec: grep "'version'\s*=>" /opt/bitnami/osclass/oc-content/languages/en_US/index.php + exit-status: 0 + stdout: + - "{{ .Env.APP_VERSION }}" + check-enabled-modules: + exec: php -m + exit-status: 0 + stdout: + {{ range $module := .Vars.phpmodules }} + - "{{ $module }}" + {{ end }} +file: + # HTTP vhost should have been properly rendered + /opt/bitnami/apache/conf/vhosts/osclass-vhost.conf: + exists: true + filetype: file + contains: + - /DocumentRoot.*/opt/bitnami/osclass/ + - 'RewriteRule "^/oc-admin$"' + # HTTPS vhost should have been properly rendered + /opt/bitnami/apache/conf/vhosts/osclass-https-vhost.conf: + exists: true + filetype: file + contains: + - "SSLEngine on" + - /DocumentRoot.*/opt/bitnami/osclass/ + - 'RewriteRule "^/oc-admin$"' +group: + daemon: + exists: true +user: + daemon: + exists: true diff --git a/.vib/osclass/goss/vars.yaml b/.vib/osclass/goss/vars.yaml new file mode 100644 index 000000000000..d39d8346ea4c --- /dev/null +++ b/.vib/osclass/goss/vars.yaml @@ -0,0 +1,19 @@ +binaries: + - apachectl + - mariadb + - php + - render-template +directories: + - mode: "0775" + paths: + - /bitnami/osclass + - /opt/bitnami/osclass + - /opt/bitnami/osclass/oc-content +files: + - paths: [] +phpmodules: + # Based on Requirements section from https://osclass-classifieds.com/download + # Required + - mysqli + - gd +root_dir: /opt/bitnami diff --git a/.vib/osclass/vib-publish.json b/.vib/osclass/vib-publish.json index 8b6fe8eab4e6..7c74600f1e2b 100644 --- a/.vib/osclass/vib-publish.json +++ b/.vib/osclass/vib-publish.json @@ -3,7 +3,8 @@ "resources": { "url": "{VIB_ENV_CONTAINER_URL}", "path": "{VIB_ENV_PATH}" - } + }, + "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" }, "phases": { "package": { @@ -33,6 +34,21 @@ }, "verify": { "actions": [ + { + "action_id": "goss", + "params": { + "resources": { + "path": "/.vib" + }, + "tests_file": "osclass/goss/goss.yaml", + "vars_file": "osclass/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-osclass" + } + } + } + }, { "action_id": "trivy", "params": { diff --git a/.vib/osclass/vib-verify.json b/.vib/osclass/vib-verify.json index a34e8aee9161..467386d0478f 100644 --- a/.vib/osclass/vib-verify.json +++ b/.vib/osclass/vib-verify.json @@ -3,7 +3,8 @@ "resources": { "url": "{SHA_ARCHIVE}", "path": "{VIB_ENV_PATH}" - } + }, + "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" }, "phases": { "package": { @@ -29,6 +30,21 @@ }, "verify": { "actions": [ + { + "action_id": "goss", + "params": { + "resources": { + "path": "/.vib" + }, + "tests_file": "osclass/goss/goss.yaml", + "vars_file": "osclass/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-osclass" + } + } + } + }, { "action_id": "trivy", "params": {