mirror of https://github.com/knative/client.git
Use Tekton Catalog GA structure for tasks (#966)
This commit is contained in:
parent
cc1b68e068
commit
7b2abc7a56
|
|
@ -17,6 +17,7 @@
|
||||||
package e2e
|
package e2e
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
@ -55,16 +56,16 @@ func TestTektonPipeline(t *testing.T) {
|
||||||
_, err = kubectl.Run("apply", "-f", basedir+"/kn-deployer-rbac.yaml")
|
_, err = kubectl.Run("apply", "-f", basedir+"/kn-deployer-rbac.yaml")
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
|
|
||||||
_, err = kubectl.Run("apply", "-f", "https://raw.githubusercontent.com/tektoncd/catalog/v1beta1/git/git-clone.yaml")
|
_, err = kubectl.Run("apply", "-f", tektonCatalogTask("git-clone", "0.1"))
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
|
|
||||||
_, err = kubectl.Run("apply", "-f", basedir+"/resources.yaml")
|
_, err = kubectl.Run("apply", "-f", basedir+"/resources.yaml")
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
|
|
||||||
_, err = kubectl.Run("apply", "-f", "https://raw.githubusercontent.com/tektoncd/catalog/v1beta1/buildah/buildah.yaml")
|
_, err = kubectl.Run("apply", "-f", tektonCatalogTask("buildah", "0.1"))
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
|
|
||||||
_, err = kubectl.Run("apply", "-f", "https://raw.githubusercontent.com/tektoncd/catalog/v1beta1/kn/kn.yaml")
|
_, err = kubectl.Run("apply", "-f", tektonCatalogTask("kn", "0.1"))
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
|
|
||||||
_, err = kubectl.Run("apply", "-f", basedir+"/kn-pipeline.yaml")
|
_, err = kubectl.Run("apply", "-f", basedir+"/kn-pipeline.yaml")
|
||||||
|
|
@ -91,3 +92,11 @@ func waitForPipelineSuccess(k test.Kubectl) error {
|
||||||
return strings.Contains(out, "True"), err
|
return strings.Contains(out, "True"), err
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func tektonCatalogTask(taskName, version string) string {
|
||||||
|
return fmt.Sprintf(
|
||||||
|
"https://raw.githubusercontent.com/tektoncd/catalog/"+
|
||||||
|
"master/task/%s/%s/%s.yaml",
|
||||||
|
taskName, version, taskName,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue