From f3e883056679e5fbd83c3609569ab51e29f983a2 Mon Sep 17 00:00:00 2001 From: Jose Antonio Carmona Date: Fri, 19 Aug 2022 08:59:50 +0200 Subject: [PATCH] [bitnami/mysql] Revisit tests (#11785) Signed-off-by: Jose Antonio Carmona Signed-off-by: Jose Antonio Carmona --- .vib/mysql/goss/goss.yaml | 29 ++++++++++------------------- .vib/mysql/goss/vars.yaml | 13 +++++++++++++ .vib/mysql/vib-publish.json | 9 +++++---- .vib/mysql/vib-verify.json | 9 +++++---- 4 files changed, 33 insertions(+), 27 deletions(-) create mode 100644 .vib/mysql/goss/vars.yaml diff --git a/.vib/mysql/goss/goss.yaml b/.vib/mysql/goss/goss.yaml index 8a6ef867f7..4d3d140c74 100644 --- a/.vib/mysql/goss/goss.yaml +++ b/.vib/mysql/goss/goss.yaml @@ -1,34 +1,25 @@ command: - mysql-env: - exec: env + create-table-root-test: + exec: mysql -h mysql-primary -u root -P {{ .Vars.primary.service.ports.mysql }} -p'{{ .Vars.auth.rootPassword }}' {{ .Vars.auth.database }} -e 'DROP TABLE IF EXISTS TEST; create table TEST(test_id int auto_increment, test_value int, primary key(test_id)); INSERT INTO TEST (TEST_VALUE) VALUES (1993);SELECT * FROM TEST' exit-status: 0 stdout: - - "MYSQL_DATABASE=important_db" - stderr: [ ] - timeout: 40000 - mysql-create: - exec: mysql -h localhost -u root -p"$MYSQL_ROOT_PASSWORD" "$MYSQL_DATABASE" -e 'DROP TABLE IF EXISTS TEST; create table TEST( test_id int auto_increment, test_value int, primary key(test_id)); INSERT INTO TEST (TEST_VALUE) VALUES (1993);SELECT * FROM TEST' + - 1993 + replication-test: + exec: mysql -h mysql-primary -u {{ .Vars.auth.username }} -P {{ .Vars.primary.service.ports.mysql }} -p'{{ .Vars.auth.password }}' {{ .Vars.auth.database }} -e 'DROP TABLE IF EXISTS TEST_REP; create table TEST_REP(test_id int auto_increment, test_value varchar(4), primary key(test_id)); INSERT INTO TEST_REP (TEST_VALUE) VALUES (2022)' && sleep 2 && mysql -h mysql-secondary -u {{ .Vars.auth.username }} -P {{ .Vars.secondary.service.ports.mysql }} -p'{{ .Vars.auth.password }}' {{ .Vars.auth.database }} -e 'SELECT * FROM TEST_REP' exit-status: 0 stdout: - - "test_id" - - "test_value" - - "1993" - stderr: [ ] - timeout: 40000 - user-id-test: - exec: if [ "$(id -u)" -eq 0 ]; then exit 1; fi - exit-status: 0 - stdout: [] - stderr: [] + - 2022 + timeout: 9000 file: - {{ printf "/bitnami/mysql/data/%s" .Env.MYSQL_DATABASE }}: + /bitnami/mysql/data/{{ .Vars.auth.database }}: mode: "2750" filetype: directory exists: true /opt/bitnami/mysql/conf/my.cnf: mode: "0644" filetype: file - contains: + contains: + - "[mysqld]" - "datadir=/bitnami/mysql/data" - "socket=/opt/bitnami/mysql/tmp/mysql.sock" exists: true diff --git a/.vib/mysql/goss/vars.yaml b/.vib/mysql/goss/vars.yaml new file mode 100644 index 0000000000..826a47fd1c --- /dev/null +++ b/.vib/mysql/goss/vars.yaml @@ -0,0 +1,13 @@ +auth: + database: test_database + username: "user" + password: "ComplicatedPassword123!4" + rootPassword: "R0ot)Password" +primary: + service: + ports: + mysql: 80 +secondary: + service: + ports: + mysql: 3306 \ No newline at end of file diff --git a/.vib/mysql/vib-publish.json b/.vib/mysql/vib-publish.json index aab36d6ec3..27fd37b163 100644 --- a/.vib/mysql/vib-publish.json +++ b/.vib/mysql/vib-publish.json @@ -22,7 +22,7 @@ "url": "{SHA_ARCHIVE}", "path": "/bitnami/mysql" }, - "runtime_parameters": "YXV0aDogCiAgcm9vdFBhc3N3b3JkOiBDb21wbGljYXRlZFBhc3N3b3JkMTIzNAogIGRhdGFiYXNlOiBpbXBvcnRhbnRfZGIKcHJpbWFyeToKICBzZXJ2aWNlOgogICAgdHlwZTogTG9hZEJhbGFuY2VyCiAgICBwb3J0czogCiAgICAgIG15c3FsOiA4MAo=", + "runtime_parameters": "YXJjaGl0ZWN0dXJlOiByZXBsaWNhdGlvbgphdXRoOgogIGRhdGFiYXNlOiB0ZXN0X2RhdGFiYXNlCiAgdXNlcm5hbWU6ICJ1c2VyIgogIHBhc3N3b3JkOiAiQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0IgogIHJvb3RQYXNzd29yZDogIlIwb3QpUGFzc3dvcmQiCnByaW1hcnk6CiAgc2VydmljZToKICAgIHR5cGU6IExvYWRCYWxhbmNlcgogICAgcG9ydHM6CiAgICAgIG15c3FsOiA4MApzZWNvbmRhcnk6CiAgc2VydmljZToKICAgIHR5cGU6IENsdXN0ZXJJUAogICAgcG9ydHM6CiAgICAgIG15c3FsOiAzMzA2", "target_platform": { "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { @@ -34,7 +34,7 @@ { "action_id": "health-check", "params": { - "endpoint": "lb-mysql-mysql" + "endpoint": "lb-mysql-primary-mysql" } }, { @@ -44,8 +44,9 @@ "path": "/.vib/mysql/goss" }, "remote": { - "workload": "sts-mysql" - } + "workload": "sts-mysql-primary" + }, + "vars_file": "vars.yaml" } } ] diff --git a/.vib/mysql/vib-verify.json b/.vib/mysql/vib-verify.json index 50a0e1e34c..99d57d8107 100644 --- a/.vib/mysql/vib-verify.json +++ b/.vib/mysql/vib-verify.json @@ -22,7 +22,7 @@ "url": "{SHA_ARCHIVE}", "path": "/bitnami/mysql" }, - "runtime_parameters": "YXV0aDogCiAgcm9vdFBhc3N3b3JkOiBDb21wbGljYXRlZFBhc3N3b3JkMTIzNAogIGRhdGFiYXNlOiBpbXBvcnRhbnRfZGIKcHJpbWFyeToKICBzZXJ2aWNlOgogICAgdHlwZTogTG9hZEJhbGFuY2VyCiAgICBwb3J0czogCiAgICAgIG15c3FsOiA4MAo=", + "runtime_parameters": "YXJjaGl0ZWN0dXJlOiByZXBsaWNhdGlvbgphdXRoOgogIGRhdGFiYXNlOiB0ZXN0X2RhdGFiYXNlCiAgdXNlcm5hbWU6ICJ1c2VyIgogIHBhc3N3b3JkOiAiQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0IgogIHJvb3RQYXNzd29yZDogIlIwb3QpUGFzc3dvcmQiCnByaW1hcnk6CiAgc2VydmljZToKICAgIHR5cGU6IExvYWRCYWxhbmNlcgogICAgcG9ydHM6CiAgICAgIG15c3FsOiA4MApzZWNvbmRhcnk6CiAgc2VydmljZToKICAgIHR5cGU6IENsdXN0ZXJJUAogICAgcG9ydHM6CiAgICAgIG15c3FsOiAzMzA2", "target_platform": { "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { @@ -34,7 +34,7 @@ { "action_id": "health-check", "params": { - "endpoint": "lb-mysql-mysql" + "endpoint": "lb-mysql-primary-mysql" } }, { @@ -44,8 +44,9 @@ "path": "/.vib/mysql/goss" }, "remote": { - "workload": "sts-mysql" - } + "workload": "sts-mysql-primary" + }, + "vars_file": "vars.yaml" } } ]