Skip to content

Commit

Permalink
extended: fix helper usage and clients in build extended tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfojtik
mfojtik committed Aug 21, 2018
1 parent 442079c commit f6c1d1c
Show file tree
Hide file tree
Showing 30 changed files with 125 additions and 114 deletions.
24 changes: 12 additions & 12 deletions test/extended/builds/build_pruning.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
br.AssertSuccess()
}

buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.InternalBuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -84,7 +84,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in

g.By("waiting up to one minute for pruning to complete")
err = wait.PollImmediate(pollingInterval, timeout, func() (bool, error) {
builds, err = oc.BuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
builds, err = oc.InternalBuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
return false, err
Expand Down Expand Up @@ -120,7 +120,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
br.AssertFailure()
}

buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.InternalBuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -129,7 +129,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in

g.By("waiting up to one minute for pruning to complete")
err = wait.PollImmediate(pollingInterval, timeout, func() (bool, error) {
builds, err = oc.BuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
builds, err = oc.InternalBuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
return false, err
Expand Down Expand Up @@ -165,7 +165,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
err = oc.Run("cancel-build").Args(fmt.Sprintf("myphp-%d", i)).Execute()
}

buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.InternalBuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -174,7 +174,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in

g.By("waiting up to one minute for pruning to complete")
err = wait.PollImmediate(pollingInterval, timeout, func() (bool, error) {
builds, err = oc.BuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
builds, err = oc.InternalBuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
return false, err
Expand Down Expand Up @@ -210,7 +210,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
br.AssertFailure()
}

buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.InternalBuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -219,7 +219,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in

g.By("waiting up to one minute for pruning to complete")
err = wait.PollImmediate(pollingInterval, timeout, func() (bool, error) {
builds, err = oc.BuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
builds, err = oc.InternalBuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
return false, err
Expand Down Expand Up @@ -261,7 +261,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
g.By("patching the build config to leave 1 build")
err = oc.Run("patch").Args("bc/myphp", "-p", `{"spec":{"failedBuildsHistoryLimit": 1}}`).Execute()

buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.InternalBuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -270,7 +270,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in

g.By("waiting up to one minute for pruning to complete")
err = wait.PollImmediate(pollingInterval, timeout, func() (bool, error) {
builds, err = oc.BuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
builds, err = oc.InternalBuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
return false, err
Expand Down Expand Up @@ -300,7 +300,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
err := oc.Run("create").Args("-f", groupBuildConfig).Execute()
o.Expect(err).NotTo(o.HaveOccurred())

buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.InternalBuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand All @@ -316,7 +316,7 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
err := oc.Run("create").Args("-f", legacyBuildConfig, "--raw=/oapi/v1/namespaces/"+oc.Namespace()+"/buildconfigs").Execute()
o.Expect(err).NotTo(o.HaveOccurred())

buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
buildConfig, err := oc.InternalBuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "%v", err)
}
Expand Down
6 changes: 3 additions & 3 deletions test/extended/builds/completiondeadlineseconds.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
o "github.com/onsi/gomega"

buildapi "github.com/openshift/origin/pkg/build/apis/build"
"github.com/openshift/origin/pkg/build/buildapihelpers"
buildinternalhelpers "github.com/openshift/origin/pkg/build/apis/build/internal_helpers"
exutil "github.com/openshift/origin/test/extended/util"
)

Expand Down Expand Up @@ -57,7 +57,7 @@ var _ = g.Describe("[Feature:Builds][Slow] builds should have deadlines", func()
o.Expect(br.Build.Status.Phase).Should(o.BeEquivalentTo(buildapi.BuildPhaseFailed)) // the build should have failed

g.By("verifying the build pod status")
pod, err := oc.KubeClient().Core().Pods(oc.Namespace()).Get(buildapihelpers.GetBuildPodName(br.Build), metav1.GetOptions{})
pod, err := oc.KubeClient().Core().Pods(oc.Namespace()).Get(buildinternalhelpers.GetBuildPodName(br.Build), metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(pod.Status.Phase).Should(o.BeEquivalentTo(kapi.PodFailed))
o.Expect(pod.Status.Reason).Should(o.ContainSubstring("DeadlineExceeded"))
Expand All @@ -81,7 +81,7 @@ var _ = g.Describe("[Feature:Builds][Slow] builds should have deadlines", func()
o.Expect(br.Build.Status.Phase).Should(o.BeEquivalentTo(buildapi.BuildPhaseFailed)) // the build should have failed

g.By("verifying the build pod status")
pod, err := oc.KubeClient().Core().Pods(oc.Namespace()).Get(buildapihelpers.GetBuildPodName(br.Build), metav1.GetOptions{})
pod, err := oc.KubeClient().Core().Pods(oc.Namespace()).Get(buildinternalhelpers.GetBuildPodName(br.Build), metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(pod.Status.Phase).Should(o.BeEquivalentTo(kapi.PodFailed))
o.Expect(pod.Status.Reason).Should(o.ContainSubstring("DeadlineExceeded"))
Expand Down
4 changes: 2 additions & 2 deletions test/extended/builds/contextdir.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ var _ = g.Describe("[Feature:Builds][Slow] builds with a context directory", fun
o.Expect(err).NotTo(o.HaveOccurred())

g.By("waiting for build to finish")
err = exutil.WaitForABuild(oc.BuildClient().Build().Builds(oc.Namespace()), s2iBuildName, exutil.CheckBuildSuccess, exutil.CheckBuildFailed, nil)
err = exutil.WaitForABuild(oc.InternalBuildClient().Build().Builds(oc.Namespace()), s2iBuildName, exutil.CheckBuildSuccess, exutil.CheckBuildFailed, nil)
if err != nil {
exutil.DumpBuildLogs("s2icontext", oc)
}
Expand Down Expand Up @@ -116,7 +116,7 @@ var _ = g.Describe("[Feature:Builds][Slow] builds with a context directory", fun

// build will fail if we don't use the right context dir because there won't be a dockerfile present.
g.By("waiting for build to finish")
err = exutil.WaitForABuild(oc.BuildClient().Build().Builds(oc.Namespace()), dockerBuildName, exutil.CheckBuildSuccess, exutil.CheckBuildFailed, nil)
err = exutil.WaitForABuild(oc.InternalBuildClient().Build().Builds(oc.Namespace()), dockerBuildName, exutil.CheckBuildSuccess, exutil.CheckBuildFailed, nil)
if err != nil {
exutil.DumpBuildLogs("dockercontext", oc)
}
Expand Down
4 changes: 2 additions & 2 deletions test/extended/builds/controller_compat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ var _ = g.Describe("[bldcompat][Slow][Compatibility] build controller", func() {

g.Describe("RunBuildControllerTest", func() {
g.It("should succeed", func() {
build.RunBuildControllerTest(g.GinkgoT(), oc.BuildClient().Build(), oc.InternalAdminKubeClient())
build.RunBuildControllerTest(g.GinkgoT(), oc.InternalBuildClient().Build(), oc.InternalAdminKubeClient())
})
})
g.Describe("RunBuildControllerPodSyncTest", func() {
g.It("should succeed", func() {
build.RunBuildControllerPodSyncTest(g.GinkgoT(), oc.BuildClient().Build(), oc.InternalAdminKubeClient())
build.RunBuildControllerPodSyncTest(g.GinkgoT(), oc.InternalBuildClient().Build(), oc.InternalAdminKubeClient())
})
})
g.Describe("RunImageChangeTriggerTest [SkipPrevControllers]", func() {
Expand Down
12 changes: 6 additions & 6 deletions test/extended/builds/dockerfile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ USER 1001
o.Expect(err).NotTo(o.HaveOccurred())

g.By("starting a test build")
bc, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("busybox", metav1.GetOptions{})
bc, err := oc.InternalBuildClient().Build().BuildConfigs(oc.Namespace()).Get("busybox", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(bc.Spec.Source.Git).To(o.BeNil())
o.Expect(*bc.Spec.Source.Dockerfile).To(o.Equal(testDockerfile))

buildName := "busybox-1"
g.By("expecting the Dockerfile build is in Complete phase")
err = exutil.WaitForABuild(oc.BuildClient().Build().Builds(oc.Namespace()), buildName, nil, nil, nil)
err = exutil.WaitForABuild(oc.InternalBuildClient().Build().Builds(oc.Namespace()), buildName, nil, nil, nil)
//debug for failures
if err != nil {
exutil.DumpBuildLogs("busybox", oc)
Expand All @@ -82,7 +82,7 @@ USER 1001
o.Expect(err).NotTo(o.HaveOccurred())

g.By("starting a test build")
bc, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("centos", metav1.GetOptions{})
bc, err := oc.InternalBuildClient().Build().BuildConfigs(oc.Namespace()).Get("centos", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(bc.Spec.Source.Git).To(o.BeNil())
o.Expect(*bc.Spec.Source.Dockerfile).To(o.Equal(testDockerfile2))
Expand All @@ -91,7 +91,7 @@ USER 1001

buildName := "centos-1"
g.By("expecting the Dockerfile build is in Complete phase")
err = exutil.WaitForABuild(oc.BuildClient().Build().Builds(oc.Namespace()), buildName, nil, nil, nil)
err = exutil.WaitForABuild(oc.InternalBuildClient().Build().Builds(oc.Namespace()), buildName, nil, nil, nil)
//debug for failures
if err != nil {
exutil.DumpBuildLogs("centos", oc)
Expand All @@ -114,13 +114,13 @@ USER 1001
o.Expect(err).NotTo(o.HaveOccurred())

g.By("starting a test build")
bc, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("scratch", metav1.GetOptions{})
bc, err := oc.InternalBuildClient().Build().BuildConfigs(oc.Namespace()).Get("scratch", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(*bc.Spec.Source.Dockerfile).To(o.Equal(testDockerfile3))

buildName := "scratch-1"
g.By("expecting the Dockerfile build is in Complete phase")
err = exutil.WaitForABuild(oc.BuildClient().Build().Builds(oc.Namespace()), buildName, nil, nil, nil)
err = exutil.WaitForABuild(oc.InternalBuildClient().Build().Builds(oc.Namespace()), buildName, nil, nil, nil)
//debug for failures
if err != nil {
exutil.DumpBuildLogs("scratch", oc)
Expand Down
20 changes: 10 additions & 10 deletions test/extended/builds/failure_status.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
br.AssertFailure()
br.DumpLogs()

build, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
build, err := oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(build.Status.Reason).To(o.Equal(buildapi.StatusReasonPostCommitHookFailed))
o.Expect(build.Status.Message).To(o.Equal(buildapi.StatusMessagePostCommitHookFailed))
Expand All @@ -79,7 +79,7 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
// is set if one is going to be set.
err = wait.Poll(time.Second, 30*time.Second, func() (bool, error) {
// note this is the same build variable used in the test scope
build, err = oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
build, err = oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
if err != nil {
return true, err
}
Expand All @@ -103,7 +103,7 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
br.AssertFailure()
br.DumpLogs()

build, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
build, err := oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(build.Status.Reason).To(o.Equal(buildapi.StatusReasonFetchSourceFailed))
o.Expect(build.Status.Message).To(o.Equal(buildapi.StatusMessageFetchSourceFailed))
Expand All @@ -122,7 +122,7 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
br.AssertFailure()
br.DumpLogs()

build, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
build, err := oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(build.Status.Reason).To(o.Equal(buildapi.StatusReasonFetchSourceFailed))
o.Expect(build.Status.Message).To(o.Equal(buildapi.StatusMessageFetchSourceFailed))
Expand All @@ -143,7 +143,7 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {

var build *buildapi.Build
wait.PollImmediate(200*time.Millisecond, 30*time.Second, func() (bool, error) {
build, err = oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
build, err = oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
if build.Status.Reason != buildapi.StatusReasonOutOfMemoryKilled {
return false, nil
}
Expand All @@ -167,7 +167,7 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
br.AssertFailure()
br.DumpLogs()

build, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
build, err := oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(build.Status.Reason).To(o.Equal(buildapi.StatusReasonInvalidContextDirectory))
o.Expect(build.Status.Message).To(o.Equal(buildapi.StatusMessageInvalidContextDirectory))
Expand All @@ -186,7 +186,7 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
br.AssertFailure()
br.DumpLogs()

build, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
build, err := oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(build.Status.Reason).To(o.Equal(buildapi.StatusReasonPullBuilderImageFailed))
o.Expect(build.Status.Message).To(o.Equal(buildapi.StatusMessagePullBuilderImageFailed))
Expand All @@ -205,7 +205,7 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
br.AssertFailure()
br.DumpLogs()

build, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
build, err := oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(build.Status.Reason).To(o.Equal(buildapi.StatusReasonPushImageToRegistryFailed))
o.Expect(build.Status.Message).To(o.Equal(buildapi.StatusMessagePushImageToRegistryFailed))
Expand All @@ -224,7 +224,7 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
br.AssertFailure()
br.DumpLogs()

build, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
build, err := oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(build.Status.Reason).To(o.Equal(reasonAssembleFailed))
o.Expect(build.Status.Message).To(o.Equal(messageAssembleFailed))
Expand All @@ -243,7 +243,7 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
br.AssertFailure()
br.DumpLogs()

build, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
build, err := oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(build.Status.Reason).To(o.Equal(buildapi.StatusReasonGenericBuildFailed))
o.Expect(build.Status.Message).To(o.Equal(buildapi.StatusMessageGenericBuildFailed))
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/imagechangetriggers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var _ = g.Describe("[Feature:Builds][Conformance] imagechangetriggers", func() {

err = wait.Poll(time.Second, 30*time.Second, func() (done bool, err error) {
for _, build := range []string{"bc-docker-1", "bc-jenkins-1", "bc-source-1", "bc-custom-1"} {
_, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(build, metav1.GetOptions{})
_, err := oc.InternalBuildClient().Build().Builds(oc.Namespace()).Get(build, metav1.GetOptions{})
if err == nil {
continue
}
Expand Down
Loading

0 comments on commit f6c1d1c

Please sign in to comment.