From 206aba2ba267e2bffb83a45f3df0dfc4bf726df6 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Wed, 6 Dec 2023 11:54:17 +0100 Subject: [PATCH] test: fix tests --- unittests/config/server-section_domain.yaml | 6 +++--- unittests/dependency-major-image-check.yaml | 2 +- unittests/deployment/image-configuration.yaml | 16 ++++++++-------- unittests/serviceaccount/basic.yaml | 2 +- unittests/serviceaccount/reference.yaml | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/unittests/config/server-section_domain.yaml b/unittests/config/server-section_domain.yaml index cf5a3b8..dfc26fe 100644 --- a/unittests/config/server-section_domain.yaml +++ b/unittests/config/server-section_domain.yaml @@ -30,15 +30,15 @@ tests: - documentIndex: 0 matchRegex: path: stringData.server - pattern: \nDOMAIN=gitea-unittests-http.testing.svc.cluster.local + pattern: \nDOMAIN=gitea-unittests-forgejo-http.testing.svc.cluster.local - documentIndex: 0 matchRegex: path: stringData.server - pattern: \nSSH_DOMAIN=gitea-unittests-http.testing.svc.cluster.local + pattern: \nSSH_DOMAIN=gitea-unittests-forgejo-http.testing.svc.cluster.local - documentIndex: 0 matchRegex: path: stringData.server - pattern: \nROOT_URL=http://gitea-unittests-http.testing.svc.cluster.local + pattern: \nROOT_URL=http://gitea-unittests-forgejo-http.testing.svc.cluster.local ################################################ diff --git a/unittests/dependency-major-image-check.yaml b/unittests/dependency-major-image-check.yaml index db33ed7..27fd39b 100644 --- a/unittests/dependency-major-image-check.yaml +++ b/unittests/dependency-major-image-check.yaml @@ -28,7 +28,7 @@ tests: matchRegex: path: spec.template.spec.containers[0].image # IN CASE OF AN INTENTIONAL MAJOR BUMP, ADJUST THIS TEST - pattern: ^docker.io/bitnami/postgresql:15.+$ + pattern: ^docker.io/bitnami/postgresql:16.+$ - it: "[redis-cluster] ensures we detect major image version upgrades" template: charts/redis-cluster/templates/redis-statefulset.yaml set: diff --git a/unittests/deployment/image-configuration.yaml b/unittests/deployment/image-configuration.yaml index 35f8981..e998240 100644 --- a/unittests/deployment/image-configuration.yaml +++ b/unittests/deployment/image-configuration.yaml @@ -14,7 +14,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: "gitea/gitea:1.19.3-rootless" + value: "codeberg.org/forgejo/forgejo:1.19.3-rootless" - it: tag override template: templates/gitea/deployment.yaml set: @@ -22,7 +22,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: "gitea/gitea:1.19.4-rootless" + value: "codeberg.org/forgejo/forgejo:1.19.4-rootless" - it: root-based image template: templates/gitea/deployment.yaml set: @@ -30,7 +30,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: "gitea/gitea:1.19.3" + value: "codeberg.org/forgejo/forgejo:1.19.3" - it: scoped registry template: templates/gitea/deployment.yaml set: @@ -38,7 +38,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: "example.com/gitea/gitea:1.19.3-rootless" + value: "example.com/forgejo/forgejo:1.19.3-rootless" - it: global registry template: templates/gitea/deployment.yaml set: @@ -46,7 +46,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: "global.example.com/gitea/gitea:1.19.3-rootless" + value: "global.example.com/forgejo/forgejo:1.19.3-rootless" - it: digest for rootless image template: templates/gitea/deployment.yaml set: @@ -56,7 +56,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: "gitea/gitea:1.19.3-rootless@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a" + value: "codeberg.org/forgejo/forgejo:1.19.3-rootless@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a" - it: image fullOverride (does not append rootless) template: templates/gitea/deployment.yaml set: @@ -81,7 +81,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: "gitea/gitea:1.19.3@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a" + value: "codeberg.org/forgejo/forgejo:1.19.3@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a" - it: digest and global registry template: templates/gitea/deployment.yaml set: @@ -90,4 +90,4 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: "global.example.com/gitea/gitea:1.19.3-rootless@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a" + value: "global.example.com/forgejo/forgejo:1.19.3-rootless@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a" diff --git a/unittests/serviceaccount/basic.yaml b/unittests/serviceaccount/basic.yaml index 73d8e1e..94b4413 100644 --- a/unittests/serviceaccount/basic.yaml +++ b/unittests/serviceaccount/basic.yaml @@ -18,7 +18,7 @@ tests: - containsDocument: kind: ServiceAccount apiVersion: v1 - name: gitea-unittests + name: gitea-unittests-forgejo - equal: path: automountServiceAccountToken value: false diff --git a/unittests/serviceaccount/reference.yaml b/unittests/serviceaccount/reference.yaml index 25faa03..90400fe 100644 --- a/unittests/serviceaccount/reference.yaml +++ b/unittests/serviceaccount/reference.yaml @@ -19,7 +19,7 @@ tests: asserts: - equal: path: spec.template.spec.serviceAccountName - value: gitea-unittests + value: gitea-unittests-forgejo - it: allows referencing an externally created ServiceAccount to the deployment template: templates/gitea/deployment.yaml set: