fix integration tests

GoogleContainerTools · Sep 5, 2019 · 0504be7 · 0504be7
1 parent 1749cdf
commit 0504be7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/integration/testdata/debug/skaffold.yaml b/integration/testdata/debug/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta10
+apiVersion: skaffold/v1beta14
 kind: Config
 build:
   artifacts:

diff --git a/integration/testdata/jib/skaffold.yaml b/integration/testdata/jib/skaffold.yaml
@@ -16,5 +16,5 @@ profiles:
   - name: old-jib
     patches:
     - op: add
-      path: /build/artifacts/0/jibMaven/args
+      path: /build/artifacts/0/jib/args
       value: ['-Djib.maven-plugin-version=1.3.0']
diff --git a/pkg/skaffold/build/local/local.go b/pkg/skaffold/build/local/local.go
@@ -82,7 +82,7 @@ func (b *Builder) runBuildForArtifact(ctx context.Context, out io.Writer, artifa
 		return b.buildBazel(ctx, out, artifact, tag)
 
 	case artifact.JibArtifact != nil:
-		return b.buildJibMaven(ctx, out, artifact.Workspace, artifact.JibArtifact, tag)
+		return b.buildJib(ctx, out, artifact, tag)
 
 	case artifact.CustomArtifact != nil:
 		return b.buildCustom(ctx, out, artifact, tag)
@@ -91,6 +91,23 @@ func (b *Builder) runBuildForArtifact(ctx context.Context, out io.Writer, artifa
 	}
 }
 
+func (b *Builder) buildJib(ctx context.Context, out io.Writer, artifact *latest.Artifact, tag string) (string, error) {
+	t, err := jib.DeterminePluginType(artifact.Workspace, artifact.JibArtifact)
+	if err != nil {
+		return "", err
+	}
+
+	switch t {
+	case jib.JibMaven:
+		return b.buildJibMaven(ctx,out, artifact.Workspace, artifact.JibArtifact, tag)
+	case jib.JibGradle:
+		return b.buildJibGradle(ctx,out, artifact.Workspace, artifact.JibArtifact, tag)
+	default:
+		return "", errors.Errorf("Unable to determine Jib builder type for %s", artifact.Workspace)
+	}
+
+}
+
 func (b *Builder) DependenciesForArtifact(ctx context.Context, a *latest.Artifact) ([]string, error) {
 	var (
 		paths []string

diff --git a/pkg/skaffold/jib/jib.go b/pkg/skaffold/jib/jib.go
@@ -90,7 +90,6 @@ var watchedFiles = map[string]filesLists{}
 
 // GetDependencies returns a list of files to watch for changes to rebuild
 func GetDependencies(ctx context.Context, workspace string, artifact *latest.JibArtifact) ([]string, error) {
-	// otherewise guess from artifacgt workspace
 	t, err := DeterminePluginType(workspace, artifact)
 	if err != nil {
 		return nil, err