Improve e2e tests - add waitForJobToFinish

test/e2e/wait.go

@@ -2,6 +2,7 @@ package e2e
 
 import (
 	goctx "context"
+	"github.com/bndr/gojenkins"
 	"net/http"
 	"testing"
 	"time"
@@ -29,6 +30,28 @@ var (
 // checkConditionFunc is used to check if a condition for the jenkins CR is set
 type checkConditionFunc func(*v1alpha2.Jenkins, error) bool
 
+func waitForJobToFinish(t *testing.T, job *gojenkins.Job, tick, timeout time.Duration) {
+	err := try.Until(func() (end bool, err error) {
+		t.Logf("Waiting for job `%s` to finish", job.GetName())
+		running, err := job.IsRunning()
+		if err != nil {
+			return false, err
+		}
+
+		queued, err := job.IsQueued()
+		if err != nil {
+			return false, err
+		}
+
+		if !running && !queued {
+			return true, nil
+		}
+
+		return false, nil
+	}, tick, timeout)
+	require.NoError(t, err)
+}
+
 func waitForJenkinsBaseConfigurationToComplete(t *testing.T, jenkins *v1alpha2.Jenkins) {
 	t.Log("Waiting for Jenkins base configuration to complete")
 	_, err := WaitUntilJenkinsConditionSet(retryInterval, 150, jenkins, func(jenkins *v1alpha2.Jenkins, err error) bool {