Skip to content

Commit 0da1e64

Browse files
ewoutpewoutp
authored
Merge pull request #118 from arangodb/cleanup-failed-tests-in-jenkins
Added envvar (CLEANUPDEPLOYMENTS) to cleanup failed tests.
2 parents 8e012b6 + f016b26 commit 0da1e64

13 files changed

+45
-3
lines changed

‎Jenkinsfile.groovy‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ def buildTestSteps(Map myParams, String kubeConfigRoot, String kubeconfig) {
7878
timestamps {
7979
withCredentials([string(credentialsId: 'ENTERPRISEIMAGE', variable: 'DEFAULTENTERPRISEIMAGE')]) {
8080
withEnv([
81+
"CLEANDEPLOYMENTS=1",
8182
"DEPLOYMENTNAMESPACE=${myParams.TESTNAMESPACE}-${env.GIT_COMMIT}",
8283
"DOCKERNAMESPACE=${myParams.DOCKERNAMESPACE}",
8384
"ENTERPRISEIMAGE=${myParams.ENTERPRISEIMAGE}",

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ TESTLENGTHOPTIONS := -test.short
8080
TESTTIMEOUT := 20m
8181
ifeq ($(LONG), 1)
8282
TESTLENGTHOPTIONS :=
83-
TESTTIMEOUT := 60m
83+
TESTTIMEOUT := 120m
8484
endif
8585
ifdef VERBOSE
8686
TESTVERBOSEOPTIONS := -v

‎scripts/kube_run_tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ kubectl --namespace ${DEPLOYMENTNAMESPACE} \
1515
--image=${IMAGEID} \
1616
--env="ENTERPRISEIMAGE=${ENTERPRISEIMAGE}" \
1717
--env="TEST_NAMESPACE=${DEPLOYMENTNAMESPACE}" \
18+
--env="CLEANDEPLOYMENTS=${CLEANDEPLOYMENTS}" \
1819
-- \
1920
-test.v -test.timeout $TESTTIMEOUT $TESTLENGTHOPTIONS $TESTOPTIONS

‎tests/auth_test.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) {
3333
if err != nil {
3434
t.Fatalf("Create deployment failed: %v", err)
3535
}
36+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
3637

3738
// Wait for deployment to be ready
3839
if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
@@ -86,6 +87,7 @@ func TestAuthenticationSingleCustomSecret(t *testing.T) {
8687
if err != nil {
8788
t.Fatalf("Create deployment failed: %v", err)
8889
}
90+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
8991

9092
// Wait for deployment to be ready
9193
if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
@@ -106,7 +108,7 @@ func TestAuthenticationSingleCustomSecret(t *testing.T) {
106108

107109
// Secret must still exist
108110
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, nil, time.Second); err != nil {
109-
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.JWTSecretName, err)
111+
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.GetJWTSecretName(), err)
110112
}
111113

112114
// Cleanup secret
@@ -132,6 +134,7 @@ func TestAuthenticationNoneSingle(t *testing.T) {
132134
if err != nil {
133135
t.Fatalf("Create deployment failed: %v", err)
134136
}
137+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
135138

136139
// Wait for deployment to be ready
137140
if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
@@ -169,6 +172,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) {
169172
if err != nil {
170173
t.Fatalf("Create deployment failed: %v", err)
171174
}
175+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
172176

173177
// Wait for deployment to be ready
174178
if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
@@ -222,6 +226,7 @@ func TestAuthenticationClusterCustomSecret(t *testing.T) {
222226
if err != nil {
223227
t.Fatalf("Create deployment failed: %v", err)
224228
}
229+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
225230

226231
// Wait for deployment to be ready
227232
if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
@@ -242,7 +247,7 @@ func TestAuthenticationClusterCustomSecret(t *testing.T) {
242247

243248
// Secret must still exist
244249
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, nil, time.Second); err != nil {
245-
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.JWTSecretName, err)
250+
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.GetJWTSecretName(), err)
246251
}
247252

248253
// Cleanup secret
@@ -268,6 +273,7 @@ func TestAuthenticationNoneCluster(t *testing.T) {
268273
if err != nil {
269274
t.Fatalf("Create deployment failed: %v", err)
270275
}
276+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
271277

272278
// Wait for deployment to be ready
273279
if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {

‎tests/deployments_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ func deploymentSubTest(t *testing.T, mode api.DeploymentMode, engine api.Storage
8484
// Create deployment
8585
_, err := deploymentClient.DatabaseV1alpha().ArangoDeployments(k8sNameSpace).Create(deploymentTemplate)
8686
require.NoError(t, err, fmt.Sprintf("Create deployment failed: %v", err))
87+
defer deferedCleanupDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace)
8788

8889
// Wait for deployment to be ready
8990
deployment, err := waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentIsReady())
@@ -124,9 +125,11 @@ func TestMultiDeployment(t *testing.T) {
124125
// Create deployments
125126
_, err := deploymentClient.DatabaseV1alpha().ArangoDeployments(k8sNameSpace).Create(deploymentTemplate1)
126127
require.NoError(t, err, fmt.Sprintf("Deployment creation failed: %v", err))
128+
defer deferedCleanupDeployment(deploymentClient, deploymentTemplate1.GetName(), k8sNameSpace)
127129

128130
_, err = deploymentClient.DatabaseV1alpha().ArangoDeployments(k8sNameSpace).Create(deploymentTemplate2)
129131
require.NoError(t, err, fmt.Sprintf("Deployment creation failed: %v", err))
132+
defer deferedCleanupDeployment(deploymentClient, deploymentTemplate2.GetName(), k8sNameSpace)
130133

131134
// Wait for deployments to be ready
132135
deployment1, err := waitUntilDeployment(deploymentClient, deploymentTemplate1.GetName(), k8sNameSpace, deploymentIsReady())

‎tests/environments_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ func TestProduction(t *testing.T) {
7575
// REVIEW - should the test already fail here
7676
t.Fatalf("Create deployment failed: %v", err)
7777
}
78+
defer deferedCleanupDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace)
7879

7980
_, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentIsReady())
8081
assert.Error(t, err, fmt.Sprintf("Deployment is up and running when it should not! There are not enough nodes(%d) for all DBServers(%d) in production modes.", numNodes, dbserverCount))

‎tests/immutable_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ func TestImmutableFields(t *testing.T) {
5454
if err != nil {
5555
t.Fatalf("Create deployment failed: %v", err)
5656
}
57+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
5758

5859
// Wait for deployment to be ready
5960
if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {

‎tests/member_resilience_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ func TestMemberResilienceAgents(t *testing.T) {
3434
if err != nil {
3535
t.Fatalf("Create deployment failed: %v", err)
3636
}
37+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
3738

3839
// Wait for deployment to be ready
3940
if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
@@ -134,6 +135,7 @@ func TestMemberResilienceCoordinators(t *testing.T) {
134135
if err != nil {
135136
t.Fatalf("Create deployment failed: %v", err)
136137
}
138+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
137139

138140
// Wait for deployment to be ready
139141
if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
@@ -230,6 +232,7 @@ func TestMemberResilienceDBServers(t *testing.T) {
230232
if err != nil {
231233
t.Fatalf("Create deployment failed: %v", err)
232234
}
235+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
233236

234237
// Wait for deployment to be ready
235238
if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {

‎tests/resilience_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ func TestResiliencePod(t *testing.T) {
3737
if err != nil {
3838
t.Fatalf("Create deployment failed: %v", err)
3939
}
40+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
4041

4142
// Wait for deployment to be ready
4243
if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
@@ -117,6 +118,7 @@ func TestResiliencePVC(t *testing.T) {
117118
if err != nil {
118119
t.Fatalf("Create deployment failed: %v", err)
119120
}
121+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
120122

121123
// Wait for deployment to be ready
122124
if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
@@ -201,6 +203,7 @@ func TestResiliencePVDBServer(t *testing.T) {
201203
if err != nil {
202204
t.Fatalf("Create deployment failed: %v", err)
203205
}
206+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
204207

205208
// Wait for deployment to be ready
206209
if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
@@ -304,6 +307,7 @@ func TestResilienceService(t *testing.T) {
304307
if err != nil {
305308
t.Fatalf("Create deployment failed: %v", err)
306309
}
310+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
307311

308312
// Wait for deployment to be ready
309313
if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {

‎tests/rocksdb_encryption_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ func TestRocksDBEncryptionSingle(t *testing.T) {
4747
if err != nil {
4848
t.Fatalf("Create deployment failed: %v", err)
4949
}
50+
defer deferedCleanupDeployment(c, depl.GetName(), ns)
5051

5152
// Wait for deployment to be ready
5253
apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady())

0 commit comments

Comments
 (0)