fix tests

jenkinsci · Jun 3, 2024 · 45d85e6 · 45d85e6
1 parent 16285a5
commit 45d85e6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/api/v1alpha2/zz_generated.deepcopy.go b/api/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/configuration/base/resources/pod.go b/pkg/configuration/base/resources/pod.go
@@ -369,6 +369,11 @@ func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkins
 	objectMeta.Name = GetJenkinsMasterPodName(jenkins)
 	objectMeta.Labels = GetJenkinsMasterPodLabels(*jenkins)
 
+	if jenkins.Spec.Master.TerminationGracePeriodSeconds == nil {
+		defaultGracePeriod := constants.DefaultTerminationGracePeriodSeconds
+		jenkins.Spec.Master.TerminationGracePeriodSeconds = &defaultGracePeriod
+	}
+
 	return &corev1.Pod{
 		TypeMeta:   buildPodTypeMeta(),
 		ObjectMeta: objectMeta,

diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -15,5 +15,6 @@ const (
 	DefaultSlavePortInt32 = int32(50000)
 	// JavaOpsVariableName is the name of environment variable which consists Jenkins Java options
 	JavaOpsVariableName = "JAVA_OPTS"
+	// DefaultTerminationGracePeriodSeconds is the default pod termination period second
 	DefaultTerminationGracePeriodSeconds = int64(30)
 )
diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go
@@ -111,6 +111,8 @@ func verifyJenkinsMasterPodAttributes(jenkins *v1alpha2.Jenkins) {
 	jenkinsPod := getJenkinsMasterPod(jenkins)
 	jenkins = getJenkins(jenkins.Namespace, jenkins.Name)
 
+	defaultGracePeriod := constants.DefaultTerminationGracePeriodSeconds
+
 	assertMapContainsElementsFromAnotherMap(jenkins.Spec.Master.Annotations, jenkinsPod.ObjectMeta.Annotations)
 	Expect(jenkinsPod.Spec.NodeSelector).Should(Equal(jenkins.Spec.Master.NodeSelector))
 
@@ -125,8 +127,7 @@ func verifyJenkinsMasterPodAttributes(jenkins *v1alpha2.Jenkins) {
 
 	Expect(jenkinsPod.Labels).Should(Equal(resources.GetJenkinsMasterPodLabels(*jenkins)))
 	Expect(jenkinsPod.Spec.PriorityClassName).Should(Equal(jenkins.Spec.Master.PriorityClassName))
-
-	Expect(jenkinsPod.Spec.TerminationGracePeriodSeconds).Should(Equal(jenkins.Spec.Master.TerminationGracePeriodSeconds))
+	Expect(jenkinsPod.Spec.TerminationGracePeriodSeconds).Should(Equal(&defaultGracePeriod))
 
 	for _, actualContainer := range jenkinsPod.Spec.Containers {
 		if actualContainer.Name == resources.JenkinsMasterContainerName {