diff -up origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/builds/pipeline.go.vetf origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/builds/pipeline.go
--- origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/builds/pipeline.go.vetf 2018-06-15 17:00:56.000000000 +0200
+++ origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/builds/pipeline.go 2018-07-31 16:07:11.956168000 +0200
@@ -1,13 +1,11 @@
package builds
import (
- "bytes"
"errors"
"fmt"
"net/http"
"net/url"
"os"
- "os/exec"
"strings"
"time"
@@ -77,14 +75,12 @@ var _ = g.Describe("[Feature:Builds][Slo
multiNamespaceClientPluginPipelinePath = exutil.FixturePath("testdata", "multi-namespace-pipeline.yaml")
secretPath = exutil.FixturePath("testdata", "openshift-secret-to-jenkins-credential.yaml")
- oc = exutil.NewCLI("jenkins-pipeline", exutil.KubeConfigPath())
- ticker *time.Ticker
- j *jenkins.JenkinsRef
- dcLogFollow *exec.Cmd
- dcLogStdOut, dcLogStdErr *bytes.Buffer
- pvs = []*v1.PersistentVolume{}
- nfspod = &v1.Pod{}
- cleanup = func(jenkinsTemplatePath string) {
+ oc = exutil.NewCLI("jenkins-pipeline", exutil.KubeConfigPath())
+ ticker *time.Ticker
+ j *jenkins.JenkinsRef
+ pvs = []*v1.PersistentVolume{}
+ nfspod = &v1.Pod{}
+ cleanup = func(jenkinsTemplatePath string) {
if g.CurrentGinkgoTestDescription().Failed {
exutil.DumpPodStates(oc)
exutil.DumpPodLogsStartingWith("", oc)
@@ -205,7 +201,7 @@ var _ = g.Describe("[Feature:Builds][Slo
// This command will terminate if the Jenkins instance crashes. This
// ensures that even if the Jenkins DC restarts, we should capture
// logs from the crash.
- dcLogFollow, dcLogStdOut, dcLogStdErr, err = oc.Run("logs").Args("-f", "dc/jenkins").Background()
+ _, _, _, err = oc.Run("logs").Args("-f", "dc/jenkins").Background()
o.Expect(err).NotTo(o.HaveOccurred())
if os.Getenv(jenkins.EnableJenkinsMemoryStats) != "" {
diff -up origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/router/headers.go.vetf origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/router/headers.go
--- origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/router/headers.go.vetf 2018-06-15 17:00:56.000000000 +0200
+++ origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/router/headers.go 2018-07-31 16:07:11.956168000 +0200
@@ -24,7 +24,7 @@ var _ = g.Describe("[Conformance][Area:N
configPath = exutil.FixturePath("testdata", "router-http-echo-server.yaml")
oc = exutil.NewCLI("router-headers", exutil.KubeConfigPath())
- routerIP, routerNs string
+ routerIP string
)
g.BeforeEach(func() {
@@ -35,7 +35,7 @@ var _ = g.Describe("[Conformance][Area:N
}
o.Expect(err).NotTo(o.HaveOccurred())
routerIP = svc.Spec.ClusterIP
- routerNs = oc.KubeFramework().Namespace.Name
+ _ = oc.KubeFramework().Namespace.Name
})
g.Describe("The HAProxy router", func() {
diff -up origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/router/router.go.vetf origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/router/router.go
--- origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/router/router.go.vetf 2018-07-31 16:07:59.377060810 +0200
+++ origin-c20e2157fd102ca9bc296e00ea965a59b39a6f1d/test/extended/router/router.go 2018-07-31 16:20:37.767359058 +0200
@@ -12,7 +12,6 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/wait"
- routev1 "github.com/openshift/api/route/v1"
routeclientset "github.com/openshift/client-go/route/clientset/versioned"
exutil "github.com/openshift/origin/test/extended/util"
"github.com/openshift/origin/test/extended/util/url"
@@ -83,13 +82,11 @@ var _ = g.Describe("[Conformance][Area:N
g.By("waiting for the ingress rule to be converted to routes")
client := routeclientset.NewForConfigOrDie(oc.AdminConfig())
- var r []routev1.Route
err = wait.Poll(time.Second, time.Minute, func() (bool, error) {
routes, err := client.Route().Routes(ns).List(metav1.ListOptions{})
if err != nil {
return false, err
}
- r = routes.Items
return len(routes.Items) == 4, nil
})
o.Expect(err).NotTo(o.HaveOccurred())