From 6db899f6858e146685f240ba8298e7375e045a80 Mon Sep 17 00:00:00 2001 From: Francisco de Paz Galan Date: Tue, 11 Apr 2023 18:18:02 +0200 Subject: [PATCH] [bitnami/tomcat] Add VIB tests (#29058) * [bitnami/tomcat] Add VIB tests Signed-off-by: FraPazGal * Fix permission typo Signed-off-by: FraPazGal * Remove VIB trigger Signed-off-by: FraPazGal * Apply suggestions Signed-off-by: FraPazGal --------- Signed-off-by: FraPazGal --- .vib/tomcat/goss/goss.yaml | 12 ++++++++++++ .vib/tomcat/goss/tomcat.yaml | 25 +++++++++++++++++++++++++ .vib/tomcat/goss/vars.yaml | 23 +++++++++++++++++++++++ .vib/tomcat/vib-publish.json | 24 ++++++++++++++++++++---- .vib/tomcat/vib-verify.json | 18 +++++++++++++++++- 5 files changed, 97 insertions(+), 5 deletions(-) create mode 100644 .vib/tomcat/goss/goss.yaml create mode 100644 .vib/tomcat/goss/tomcat.yaml create mode 100644 .vib/tomcat/goss/vars.yaml diff --git a/.vib/tomcat/goss/goss.yaml b/.vib/tomcat/goss/goss.yaml new file mode 100644 index 000000000000..21c3a0b244ec --- /dev/null +++ b/.vib/tomcat/goss/goss.yaml @@ -0,0 +1,12 @@ +gossfile: + # Goss tests exclusive to the current container + ../../tomcat/goss/tomcat.yaml: {} + # Load scripts from .vib/common/goss/templates + ../../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/tomcat/goss/tomcat.yaml b/.vib/tomcat/goss/tomcat.yaml new file mode 100644 index 000000000000..018ab7fd2931 --- /dev/null +++ b/.vib/tomcat/goss/tomcat.yaml @@ -0,0 +1,25 @@ +file: + /opt/bitnami/apache-tomcat: + exists: true + filetype: symlink + linked-to: tomcat + /opt/bitnami/tomcat/webapps: + exists: true + filetype: symlink + linked-to: /bitnami/tomcat/webapps + /app: + exists: true + filetype: symlink + linked-to: /bitnami/tomcat/webapps +command: + check-app-version: + exec: version.sh + exit-status: 0 + stdout: + - {{ .Env.APP_VERSION }} +group: + tomcat: + exists: true +user: + tomcat: + exists: true diff --git a/.vib/tomcat/goss/vars.yaml b/.vib/tomcat/goss/vars.yaml new file mode 100644 index 000000000000..b6a28e24c9b5 --- /dev/null +++ b/.vib/tomcat/goss/vars.yaml @@ -0,0 +1,23 @@ +binaries: + - gosu + - java + - render-template +directories: + - mode: "0775" + paths: + - /bitnami/tomcat/webapps + - /opt/bitnami/tomcat + - /opt/bitnami/tomcat/lib + - /opt/bitnami/tomcat/temp + - /opt/bitnami/tomcat/logs + - /opt/bitnami/tomcat/conf + - /opt/bitnami/tomcat/work + - /opt/bitnami/tomcat/webapps_default +files: + - mode: "0664" + paths: + - /opt/bitnami/tomcat/bin/setenv.sh + - mode: "0755" + paths: + - /opt/bitnami/tomcat/bin/version.sh +root_dir: /opt/bitnami diff --git a/.vib/tomcat/vib-publish.json b/.vib/tomcat/vib-publish.json index 8b6fe8eab4e6..e7f8ab151d8d 100644 --- a/.vib/tomcat/vib-publish.json +++ b/.vib/tomcat/vib-publish.json @@ -3,7 +3,8 @@ "resources": { "url": "{VIB_ENV_CONTAINER_URL}", "path": "{VIB_ENV_PATH}" - } + }, + "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" }, "phases": { "package": { @@ -77,9 +78,24 @@ "url": "{VIB_ENV_PACKAGES_JSON_URL}", "path": "/{VIB_ENV_PATH}", "authn": { - "header": "Authorization", - "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" - } + "header": "Authorization", + "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" + } + } + } + }, + { + "action_id": "goss", + "params": { + "resources": { + "path": "/.vib" + }, + "tests_file": "tomcat/goss/goss.yaml", + "vars_file": "tomcat/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-tomcat" + } } } } diff --git a/.vib/tomcat/vib-verify.json b/.vib/tomcat/vib-verify.json index a34e8aee9161..fa272cd8d276 100644 --- a/.vib/tomcat/vib-verify.json +++ b/.vib/tomcat/vib-verify.json @@ -3,7 +3,8 @@ "resources": { "url": "{SHA_ARCHIVE}", "path": "{VIB_ENV_PATH}" - } + }, + "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" }, "phases": { "package": { @@ -46,6 +47,21 @@ "OS" ] } + }, + { + "action_id": "goss", + "params": { + "resources": { + "path": "/.vib" + }, + "tests_file": "tomcat/goss/goss.yaml", + "vars_file": "tomcat/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-tomcat" + } + } + } } ] }