public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

fixup! integration-test: using registry-mirror 

Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
This commit is contained in:
Yoan Blanc 2019-12-22 14:10:12 +01:00
parent c7d173cd99
commit 9fb2111379
No known key found for this signature in database
GPG Key ID: 6058CF4574298812
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
integration/integration_test.go
View File

@ -65,6 +65,7 @@ const (
} }
} }
]` ]`
dockerfileTestRun = "integration/dockerfiles/Dockerfile_test_run_2"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
@ -183,7 +184,6 @@ func TestRun(t *testing.T) {
func TestGitBuildcontext(t *testing.T) { func TestGitBuildcontext(t *testing.T) {
repo := "github.com/GoogleContainerTools/kaniko" repo := "github.com/GoogleContainerTools/kaniko"
dockerfile := "integration/dockerfiles/Dockerfile_test_run_2"
// Build with docker // Build with docker
dockerImage := GetDockerImage(config.imageRepo, "Dockerfile_test_git") dockerImage := GetDockerImage(config.imageRepo, "Dockerfile_test_git")
@ -226,14 +226,13 @@ func TestGitBuildcontext(t *testing.T) {
func TestGitBuildContextWithBranch(t *testing.T) { func TestGitBuildContextWithBranch(t *testing.T) {
repo := "github.com/GoogleContainerTools/kaniko#refs/tags/v0.10.0" repo := "github.com/GoogleContainerTools/kaniko#refs/tags/v0.10.0"
dockerfile := "integration/dockerfiles/Dockerfile_test_run_2"
// Build with docker // Build with docker
dockerImage := GetDockerImage(config.imageRepo, "Dockerfile_test_git") dockerImage := GetDockerImage(config.imageRepo, "Dockerfile_test_git")
dockerCmd := exec.Command("docker", dockerCmd := exec.Command("docker",
append([]string{"build", append([]string{"build",
"-t", dockerImage, "-t", dockerImage,
"-f", dockerfile, "-f", dockerfileTestRun,
repo})...) repo})...)
out, err := RunCommandWithoutTest(dockerCmd) out, err := RunCommandWithoutTest(dockerCmd)
if err != nil { if err != nil {
@ -272,11 +271,10 @@ func TestBuildViaRegistryMirror(t *testing.T) {
// Build with docker // Build with docker
dockerImage := GetDockerImage(config.imageRepo, "Dockerfile_test_git") dockerImage := GetDockerImage(config.imageRepo, "Dockerfile_test_git")
dockerfile := "integration/dockerfiles/Dockerfile_test_run_2"
dockerCmd := exec.Command("docker", dockerCmd := exec.Command("docker",
append([]string{"build", append([]string{"build",
"-t", dockerImage, "-t", dockerImage,
"-f", dockerfile, "-f", dockerfileTestRun,
repo})...) repo})...)
out, err := RunCommandWithoutTest(dockerCmd) out, err := RunCommandWithoutTest(dockerCmd)
if err != nil { if err != nil {