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

Fix e2e tests

This commit is contained in:
Tomasz Sęk 2019-12-19 11:03:37 +01:00
parent 1cb29c4ad5
commit 7bd02997ac
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

@ -116,7 +116,7 @@ func createJenkinsWithBackupAndRestoreConfigured(t *testing.T, name, namespace s
}, },
{ {
Name: containerName, Name: containerName,
Image: "virtuslab/jenkins-operator-backup-pvc:v0.0.3", Image: "virtuslab/jenkins-operator-backup-pvc:v0.0.6",
ImagePullPolicy: corev1.PullIfNotPresent, ImagePullPolicy: corev1.PullIfNotPresent,
Env: []corev1.EnvVar{ Env: []corev1.EnvVar{
{ {

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, 80, jenkins, func(jenkins *v1alpha2.Jenkins, err error) bool { _, err := WaitUntilJenkinsConditionSet(retryInterval, 90, 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
}) })