From baef456ffe721b60bc4ee4abf3db9ddc07abe132 Mon Sep 17 00:00:00 2001 From: Cori Avila <42420333+corico44@users.noreply.github.com> Date: Mon, 15 May 2023 16:39:41 +0200 Subject: [PATCH] [bitnami/jenkins] Add VIB tests (#31490) * [bitnami/jenkins] Add inital tests Signed-off-by: Cori Avila * [bitnami/jenkins] Add changes in docker-compose file to trigger tests Signed-off-by: Cori Avila * [bitnami/jenkins] Fix check tests Signed-off-by: Cori Avila * [bitnami/jenkins] Delete blank space Signed-off-by: corico44 <42420333+corico44@users.noreply.github.com> * [bitnami/jenkins] Fix app version test and check plugins test Signed-off-by: Cori Avila * [bitnami/jenkins] Delete file plugins test Signed-off-by: Cori Avila * [bitnami/jenkins] Delete trigger in docker-compose file Signed-off-by: Cori Avila <42420333+corico44@users.noreply.github.com> --------- Signed-off-by: Cori Avila Signed-off-by: corico44 <42420333+corico44@users.noreply.github.com> Signed-off-by: Cori Avila <42420333+corico44@users.noreply.github.com> --- .vib/jenkins/goss/goss.yaml | 13 +++++++++++++ .vib/jenkins/goss/jenkins.yaml | 4 ++++ .vib/jenkins/goss/vars.yaml | 21 +++++++++++++++++++++ .vib/jenkins/vib-publish.json | 18 +++++++++++++++++- .vib/jenkins/vib-verify.json | 18 +++++++++++++++++- 5 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 .vib/jenkins/goss/goss.yaml create mode 100644 .vib/jenkins/goss/jenkins.yaml create mode 100644 .vib/jenkins/goss/vars.yaml diff --git a/.vib/jenkins/goss/goss.yaml b/.vib/jenkins/goss/goss.yaml new file mode 100644 index 000000000000..a705ab248a36 --- /dev/null +++ b/.vib/jenkins/goss/goss.yaml @@ -0,0 +1,13 @@ +gossfile: + # Goss tests exclusive to the current container + ../../jenkins/goss/jenkins.yaml: {} + # Load scripts from .vib/common/goss/templates + ../../common/goss/templates/check-app-version.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/jenkins/goss/jenkins.yaml b/.vib/jenkins/goss/jenkins.yaml new file mode 100644 index 000000000000..99476ba70ba0 --- /dev/null +++ b/.vib/jenkins/goss/jenkins.yaml @@ -0,0 +1,4 @@ +command: + check-app-jar: + exec: java -jar /opt/bitnami/jenkins/jenkins-plugin-manager.jar + exit-status: 0 \ No newline at end of file diff --git a/.vib/jenkins/goss/vars.yaml b/.vib/jenkins/goss/vars.yaml new file mode 100644 index 000000000000..e992b59d41c9 --- /dev/null +++ b/.vib/jenkins/goss/vars.yaml @@ -0,0 +1,21 @@ +binaries: + - java + - render-template +directories: + - mode: "0775" + paths: + - /opt/bitnami/jenkins + - /opt/bitnami/jenkins/plugins + - /opt/bitnami/jenkins/tmp + - /opt/bitnami/jenkins/logs + - /bitnami/jenkins + - /bitnami/jenkins/home +files: + - paths: + - /opt/bitnami/jenkins/plugins/authorize-project.jpi + - /opt/bitnami/jenkins/plugins/matrix-auth.jpi + - /opt/bitnami/jenkins/plugins/swarm.jpi +version: + bin_name: java -jar /opt/bitnami/jenkins/jenkins.war + flag: --version +root_dir: /opt/bitnami diff --git a/.vib/jenkins/vib-publish.json b/.vib/jenkins/vib-publish.json index 8b6fe8eab4e6..077cff552ad3 100644 --- a/.vib/jenkins/vib-publish.json +++ b/.vib/jenkins/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": "jenkins/goss/goss.yaml", + "vars_file": "jenkins/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-jenkins" + } + } + } + }, { "action_id": "trivy", "params": { diff --git a/.vib/jenkins/vib-verify.json b/.vib/jenkins/vib-verify.json index a34e8aee9161..e1165f2ed904 100644 --- a/.vib/jenkins/vib-verify.json +++ b/.vib/jenkins/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": "jenkins/goss/goss.yaml", + "vars_file": "jenkins/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-jenkins" + } + } + } + }, { "action_id": "trivy", "params": {