public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Adjust timeouts in e2e tests

This commit is contained in:
Tomasz Sęk 2019-12-19 13:06:51 +01:00
parent 76cd868cdd
commit 0eaf8d9bb6
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/restorebackup_test.go
View File

@ -38,7 +38,7 @@ func TestBackupAndRestore(t *testing.T) {
i, err := job.InvokeSimple(map[string]string{}) i, err := job.InvokeSimple(map[string]string{})
require.NoError(t, err, i) require.NoError(t, err, i)
// FIXME: waitForJobToFinish use // FIXME: waitForJobToFinish use
time.Sleep(80 * time.Second) // wait for the build to complete time.Sleep(60 * time.Second) // wait for the build to complete
restartJenkinsMasterPod(t, jenkins) restartJenkinsMasterPod(t, jenkins)
waitForRecreateJenkinsMasterPod(t, jenkins) waitForRecreateJenkinsMasterPod(t, jenkins)

2
test/e2e/wait.go
View File

@ -95,7 +95,7 @@ func waitForRecreateJenkinsMasterPod(t *testing.T, jenkins *v1alpha2.Jenkins) {
func waitForJenkinsUserConfigurationToComplete(t *testing.T, jenkins *v1alpha2.Jenkins) { func waitForJenkinsUserConfigurationToComplete(t *testing.T, jenkins *v1alpha2.Jenkins) {
t.Log("Waiting for Jenkins user configuration to complete") t.Log("Waiting for Jenkins user configuration to complete")
_, err := WaitUntilJenkinsConditionSet(retryInterval, 90, jenkins, func(jenkins *v1alpha2.Jenkins, err error) bool { _, err := WaitUntilJenkinsConditionSet(retryInterval, 75, jenkins, func(jenkins *v1alpha2.Jenkins, err error) bool {
t.Logf("Current Jenkins status: '%+v', error '%s'", jenkins.Status, err) t.Logf("Current Jenkins status: '%+v', error '%s'", jenkins.Status, err)
return err == nil && jenkins.Status.UserConfigurationCompletedTime != nil return err == nil && jenkins.Status.UserConfigurationCompletedTime != nil
}) })