Skip to content

Commit 8980fe8

Browse files
committed
Add context dir to build config
Signed-off-by: Maysun J Faisal <[email protected]>
1 parent 4d13b0d commit 8980fe8

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

pkg/devfile/generator/utils.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ type BuildConfigSpecParams struct {
382382
ImageStreamTagName string
383383
GitURL string
384384
GitRef string
385+
ContextDir string
385386
BuildStrategy buildv1.BuildStrategy
386387
}
387388

@@ -401,7 +402,8 @@ func getBuildConfigSpec(buildConfigSpecParams BuildConfigSpecParams) *buildv1.Bu
401402
URI: buildConfigSpecParams.GitURL,
402403
Ref: buildConfigSpecParams.GitRef,
403404
},
404-
Type: buildv1.BuildSourceGit,
405+
ContextDir: buildConfigSpecParams.ContextDir,
406+
Type: buildv1.BuildSourceGit,
405407
},
406408
Strategy: buildConfigSpecParams.BuildStrategy,
407409
},

pkg/devfile/generator/utils_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,7 @@ func TestGetBuildConfigSpec(t *testing.T) {
12491249
name string
12501250
GitURL string
12511251
GitRef string
1252+
ContextDir string
12521253
buildStrategy buildv1.BuildStrategy
12531254
}{
12541255
{
@@ -1261,6 +1262,7 @@ func TestGetBuildConfigSpec(t *testing.T) {
12611262
name: "Case 2: Get a Docker Strategy Build Config",
12621263
GitURL: "url",
12631264
GitRef: "ref",
1265+
ContextDir: "./",
12641266
buildStrategy: GetDockerBuildStrategy("dockerfilePath", []corev1.EnvVar{}),
12651267
},
12661268
}
@@ -1272,6 +1274,7 @@ func TestGetBuildConfigSpec(t *testing.T) {
12721274
BuildStrategy: tt.buildStrategy,
12731275
GitURL: tt.GitURL,
12741276
GitRef: tt.GitRef,
1277+
ContextDir: tt.ContextDir,
12751278
}
12761279
buildConfigSpec := getBuildConfigSpec(params)
12771280

@@ -1282,6 +1285,10 @@ func TestGetBuildConfigSpec(t *testing.T) {
12821285
if buildConfigSpec.Source.Git.Ref != tt.GitRef || buildConfigSpec.Source.Git.URI != tt.GitURL {
12831286
t.Error("TestGetBuildConfigSpec error - build config git source does not match")
12841287
}
1288+
1289+
if buildConfigSpec.CommonSpec.Source.ContextDir != tt.ContextDir {
1290+
t.Error("TestGetBuildConfigSpec error - context dir does not match")
1291+
}
12851292
})
12861293
}
12871294

0 commit comments

Comments
 (0)