Skip to content

create the buildconfig before creating the first imagerepo #1248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 1 commit into from
Mar 6, 2015
Merged

create the buildconfig before creating the first imagerepo #1248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 43 additions & 14 deletions test/integration/imagechange_buildtrigger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,37 +38,68 @@ func TestSimpleImageChangeBuildTrigger(t *testing.T) {
}
defer watch.Stop()

if imageRepo, err = openshift.Client.ImageRepositories(testNamespace).Create(imageRepo); err != nil {
t.Fatalf("Couldn't create ImageRepository: %v", err)
}

created, err := openshift.Client.BuildConfigs(testNamespace).Create(config)
if err != nil {
t.Fatalf("Couldn't create BuildConfig: %v", err)
}

watch2, err := openshift.Client.BuildConfigs(testNamespace).Watch(labels.Everything(), labels.Everything(), created.ResourceVersion)
if err != nil {
t.Fatalf("Couldn't subscribe to BuildConfigs %v", err)
}
defer watch2.Stop()

imageRepo.Tags["latest"] = "ref-2"

if _, err = openshift.Client.ImageRepositories(testNamespace).Update(imageRepo); err != nil {
t.Fatalf("Error updating imageRepo: %v", err)
imageRepo, err = openshift.Client.ImageRepositories(testNamespace).Create(imageRepo)
if err != nil {
t.Fatalf("Couldn't create ImageRepository: %v", err)
}

// initial build event from the creation of the imagerepo with tag ref-1
event := <-watch.ResultChan()
if e, a := watchapi.Added, event.Type; e != a {
t.Fatalf("expected watch event type %s, got %s", e, a)
}
newBuild := event.Object.(*buildapi.Build)
if newBuild.Parameters.Strategy.DockerStrategy.Image != "registry:8080/openshift/test-image-trigger:ref-1" {
i, _ := openshift.Client.ImageRepositories(testNamespace).Get(imageRepo.Name)
bc, _ := openshift.Client.BuildConfigs(testNamespace).Get(config.Name)
t.Fatalf("Expected build with base image %s, got %s\n, imagerepo is %v\trigger is %s\n", "registry:8080/openshift/test-image-trigger:ref-1", newBuild.Parameters.Strategy.DockerStrategy.Image, i, bc.Triggers[0].ImageChange)
}
event = <-watch.ResultChan()
if e, a := watchapi.Modified, event.Type; e != a {
t.Fatalf("expected watch event type %s, got %s", e, a)
}
newBuild = event.Object.(*buildapi.Build)
if newBuild.Parameters.Output.DockerImageReference != "registry:8080/openshift/test-image-trigger:outputtag" {
t.Fatalf("Expected build with output image %s, got %s", "registry:8080/openshift/test-image-trigger:outputtag", newBuild.Parameters.Output.DockerImageReference)
}
if newBuild.Labels["testlabel"] != "testvalue" {
t.Fatalf("Expected build with label %s=%s from build config got %s=%s", "testlabel", "testvalue", "testlabel", newBuild.Labels["testlabel"])
}
event = <-watch2.ResultChan()
updatedConfig, err := openshift.Client.BuildConfigs(testNamespace).Get(config.Name)
if err != nil {
t.Fatalf("Couldn't get BuildConfig: %v", err)
}
if updatedConfig.Triggers[0].ImageChange.LastTriggeredImageID != "ref-1" {
t.Errorf("Expected imageID ref-1, got %s", updatedConfig.Triggers[0].ImageChange.LastTriggeredImageID)
}

if newBuild.Parameters.Strategy.DockerStrategy.Image != "registry:8080/openshift/test-image-trigger:ref-2" {
t.Fatalf("Expected build with base image %s, got %s", "registry:8080/openshift/test-image-trigger:ref-2", newBuild.Parameters.Strategy.DockerStrategy.Image)
// update the image tag to ref-2 in the imagerepo so we get another build event using that tag.
imageRepo.Tags["latest"] = "ref-2"
if _, err = openshift.Client.ImageRepositories(testNamespace).Update(imageRepo); err != nil {
t.Fatalf("Error updating imageRepo: %v", err)
}

event = <-watch.ResultChan()
if e, a := watchapi.Added, event.Type; e != a {
t.Fatalf("expected watch event type %s, got %s", e, a)
}
newBuild = event.Object.(*buildapi.Build)
if newBuild.Parameters.Strategy.DockerStrategy.Image != "registry:8080/openshift/test-image-trigger:ref-2" {
i, _ := openshift.Client.ImageRepositories(testNamespace).Get(imageRepo.Name)
bc, _ := openshift.Client.BuildConfigs(testNamespace).Get(config.Name)
t.Fatalf("Expected build with base image %s, got %s\n, imagerepo is %v\trigger is %s\n", "registry:8080/openshift/test-image-trigger:ref-2", newBuild.Parameters.Strategy.DockerStrategy.Image, i, bc.Triggers[0].ImageChange)
}
event = <-watch.ResultChan()
if e, a := watchapi.Modified, event.Type; e != a {
t.Fatalf("expected watch event type %s, got %s", e, a)
Expand All @@ -82,9 +113,7 @@ func TestSimpleImageChangeBuildTrigger(t *testing.T) {
}

event = <-watch2.ResultChan()
event = <-watch2.ResultChan()

updatedConfig, err := openshift.Client.BuildConfigs(testNamespace).Get(config.Name)
updatedConfig, err = openshift.Client.BuildConfigs(testNamespace).Get(config.Name)
if err != nil {
t.Fatalf("Couldn't get BuildConfig: %v", err)
}
Copy link
Contributor

@soltysh soltysh Mar 6, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd copy here, since you already have the updatedConfig object check for the LastTriggeredImageID:

if updatedConfig.Triggers[0].ImageChange.LastTriggeredImageID != "ref-2" {
    t.Errorf("Expected imageID ref-1, got %s", updatedConfig.Triggers[0].ImageChange.LastTriggeredImageID)
}

Copy link
Contributor Author

@bparees bparees Mar 6, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as discussed on irc, the check is there for both buildconfigs. (ref-1 and ref-2)

Expand Down