From 125b4c989806b474ff372d7ef4dd493e1b84705a Mon Sep 17 00:00:00 2001
From: Jakub Al-Khalili <jakubalkhalili@gmail.com>
Date: Fri, 13 Sep 2019 16:20:14 +0200
Subject: [PATCH] #90 Fix pipeline groovy script

---
 cicd/pipelines/k8s.jenkins     | 11 +++++++----
 test/e2e/configuration_test.go |  6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cicd/pipelines/k8s.jenkins b/cicd/pipelines/k8s.jenkins
index 8914d34c..5df55672 100644
--- a/cicd/pipelines/k8s.jenkins
+++ b/cicd/pipelines/k8s.jenkins
@@ -1,17 +1,20 @@
 #!/usr/bin/env groovy
 
-def label = "k8s-e2e"
+def label = "k8sagent-e2e"
 def home = "/home/jenkins"
 def workspace = "${home}/workspace/build-jenkins-operator"
+def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/"
 
 podTemplate(label: label,
         containers: [
-                containerTemplate(name: 'alpine', image: 'alpine:3.10.2'),
+                containerTemplate(name: 'alpine', image: 'alpine:3.10.2', ttyEnabled: true, command: 'cat'),
         ],
         ) {
     node(label) {
-        container('alpine') {
-            sh 'echo "Its working"'
+        stage('Run shell') {
+            container('alpine') {
+                sh 'echo "hello world"'
+            }
         }
     }
 }
diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go
index 5e1c3c5e..7802500f 100644
--- a/test/e2e/configuration_test.go
+++ b/test/e2e/configuration_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"testing"
+	"time"
 
 	jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client"
 	"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base"
@@ -128,9 +129,12 @@ func TestPlugins(t *testing.T) {
 	i, err := job.InvokeSimple(map[string]string{})
 	require.NoError(t, err, i)
 
+	time.Sleep(time.Minute * 2)
+
+	job, err = jenkinsClient.GetJob(jobID)
+	require.NoError(t, err, job)
 	build, err := job.GetLastBuild()
 	require.NoError(t, err)
-	assert.Equal(t, int64(1), build.GetBuildNumber())
 	assert.True(t, build.IsGood())
 }