Skip to content
Snippets Groups Projects
Commit 70d101f2 authored by Vineet Reddy Rajula's avatar Vineet Reddy Rajula
Browse files

Add envtest for checking GitlabWebhookURL on drupalSite status

parent 82aec84b
Branches
No related tags found
1 merge request!124Add gitlab trigger and Increase buildconfig resource memory limit
Pipeline #3221055 failed
...@@ -39,6 +39,7 @@ import ( ...@@ -39,6 +39,7 @@ import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"
) )
// Ginkgo makes it easy to write expressive specs that describe the behavior of your code in an organized manner. // Ginkgo makes it easy to write expressive specs that describe the behavior of your code in an organized manner.
...@@ -805,6 +806,7 @@ var _ = Describe("DrupalSite controller", func() { ...@@ -805,6 +806,7 @@ var _ = Describe("DrupalSite controller", func() {
oidcReturnUri := authz.OidcReturnURI{} oidcReturnUri := authz.OidcReturnURI{}
schedule := velerov1.Schedule{} schedule := velerov1.Schedule{}
cronjob := batchbeta1.CronJob{} cronjob := batchbeta1.CronJob{}
secret := corev1.Secret{}
// Check DBOD resource creation // Check DBOD resource creation
By("Expecting Database resource created") By("Expecting Database resource created")
...@@ -949,6 +951,23 @@ var _ = Describe("DrupalSite controller", func() { ...@@ -949,6 +951,23 @@ var _ = Describe("DrupalSite controller", func() {
k8sClient.Get(ctx, types.NamespacedName{Name: "cronjob-" + key.Name, Namespace: key.Namespace}, &cronjob) k8sClient.Get(ctx, types.NamespacedName{Name: "cronjob-" + key.Name, Namespace: key.Namespace}, &cronjob)
return cronjob.ObjectMeta.OwnerReferences return cronjob.ObjectMeta.OwnerReferences
}, timeout, interval).Should(ContainElement(expectedOwnerReference)) }, timeout, interval).Should(ContainElement(expectedOwnerReference))
// Check gitlab webhook secret resource creation
By("Expecting Gitlab webhook secret created")
Eventually(func() []metav1.OwnerReference {
k8sClient.Get(ctx, types.NamespacedName{Name: "gitlab-trigger-secret-" + key.Name, Namespace: key.Namespace}, &secret)
return secret.ObjectMeta.OwnerReferences
}, timeout, interval).Should(ContainElement(expectedOwnerReference))
// Check gitlab webhook URL updated on the drupalSite status
By("Expecting Gitlab webhook secret created")
Eventually(func() bool {
cfg, err := ctrl.GetConfig()
if err != nil {
return false
}
return cr.Status.GitlabWebhookURL == cfg.Host+"/apis/build.openshift.io/v1/namespaces/"+drupalSiteObject.Namespace+"/buildconfigs/"+"sitebuilder-s2i-"+nameVersionHash(drupalSiteObject)+"/webhooks/"+string(secret.Data["WebHookSecretKey"])+"/gitlab"
}, timeout, interval).Should(BeTrue())
}) })
}) })
}) })
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment