Merge pull request #2020 from lcarva/EC-811

Remove verify-definition Task

.github/workflows/release.yaml

@@ -122,7 +122,7 @@ jobs:
       - name: Create and push the tekton bundle (quay.io/enterprise-contract/ec-task-bundle)
         env:
           TASK_REPO: quay.io/enterprise-contract/ec-task-bundle
-          TASKS: "tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-definition/0.1/verify-definition.yaml"
+          TASKS: "tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml"
         run: make task-bundle-snapshot TASK_REPO=$TASK_REPO TASK_TAG=$TAG ADD_TASK_TAG="$TAG_TIMESTAMP" TASKS=<( yq e ".spec.steps[].image? = \"$IMAGE_REPO:$TAG\"" $TASKS | yq 'select(. != null)')
 
       - name: Download statistics

Makefile

@@ -272,14 +272,14 @@ dev: IMAGE_REPO=localhost:$(REGISTRY_PORT)/ec
 dev: PODMAN_OPTS=--tls-verify=false
 dev: TASK_REPO=localhost:$(REGISTRY_PORT)/ec-task-bundle
 dev: SKOPEO_ARGS=--src-tls-verify=false --dest-tls-verify=false
-dev: TASKS:=$(shell T=$$(mktemp) && yq e ".spec.steps[].image? = \"localhost:$(REGISTRY_PORT)/ec\"" tasks/verify-enterprise-contract/*/verify-enterprise-contract.yaml tasks/verify-definition/*/verify-definition.yaml | yq 'select(. != null)' > "$${T}" && echo "$${T}")
+dev: TASKS:=$(shell T=$$(mktemp) && yq e ".spec.steps[].image? = \"localhost:$(REGISTRY_PORT)/ec\"" tasks/verify-enterprise-contract/*/verify-enterprise-contract.yaml | yq 'select(. != null)' > "$${T}" && echo "$${T}")
 dev: push-image task-bundle ## Push the ec-cli and v-e-c Task Bundle to the kind cluster setup via hack/setup-dev-environment.sh
 	@rm "$(TASKS)"
 
 TASK_TAG ?= latest
 TASK_REPO ?= quay.io/enterprise-contract/ec-task-bundle
 TASK_VERSION ?= 0.1
-TASKS ?= tasks/verify-enterprise-contract/$(TASK_VERSION)/verify-enterprise-contract.yaml tasks/verify-definition/$(TASK_VERSION)/verify-definition.yaml
+TASKS ?= tasks/verify-enterprise-contract/$(TASK_VERSION)/verify-enterprise-contract.yaml
 ifneq (,$(findstring localhost:,$(TASK_REPO)))
 SKOPEO_ARGS=--src-tls-verify=false --dest-tls-verify=false
 endif

acceptance/kubernetes/kind/image.go

@@ -76,7 +76,7 @@ func (k *kindCluster) buildTaskBundleImage(ctx context.Context) error {
 		}
 		for _, versionPath := range versions {
 			pathSplit := strings.Split(versionPath, "/")
-			// there should only be versions under the task path i.e. tasks/verify-definition/0.1
+			// there should only be versions under the task path i.e. tasks/verify-enterprise-contract/0.1
 			version := pathSplit[len(pathSplit)-1]
 			// assume the task definition file is named the same as the task directory
 			fileName := filepath.Join(versionPath, fmt.Sprintf("%s.yaml", taskName))

docs/modules/ROOT/partials/tasks_nav.adoc

@@ -1,3 +1,2 @@
 * xref:tasks.adoc[Tekton Tasks]
-** xref:verify-definition.adoc[verify-definition]
 ** xref:verify-enterprise-contract.adoc[verify-enterprise-contract]