Merge branch 'main' of https://github.com/tektoncd/pipeline into herm…

…etic

docs/pipelines.md

@@ -69,8 +69,8 @@ A `Pipeline` definition supports the following fields:
     `Pipeline` object. For example, a `name`.
   - [`spec`][kubernetes-overview] - Specifies the configuration information for
     this `Pipeline` object. This must include:
-    - [`tasks`](#adding-tasks-to-the-pipeline) - Specifies the `Tasks` that comprise the `Pipeline`
-      and the details of their execution.
+      - [`tasks`](#adding-tasks-to-the-pipeline) - Specifies the `Tasks` that comprise the `Pipeline`
+        and the details of their execution.
 - Optional:
   - [`resources`](#specifying-resources) - **alpha only** Specifies
     [`PipelineResources`](resources.md) needed or created by the `Tasks` comprising the `Pipeline`.

pkg/pod/pod_test.go

@@ -1235,7 +1235,8 @@ script-heredoc-randomly-generated-78c5n
 				Volumes: append(implicitVolumes, toolsVolume, downwardVolume),
 			},
 		}, {
-			desc: "hermetic env var",
+			desc:         "hermetic env var",
+			featureFlags: map[string]string{"enable-api-fields": "alpha"},
 			ts: v1beta1.TaskSpec{
 				Steps: []v1beta1.Step{{Container: corev1.Container{
 					Name:    "name",
@@ -1281,7 +1282,8 @@ script-heredoc-randomly-generated-78c5n
 				}),
 			},
 		}, {
-			desc: "override hermetic env var",
+			desc:         "override hermetic env var",
+			featureFlags: map[string]string{"enable-api-fields": "alpha"},
 			ts: v1beta1.TaskSpec{
 				Steps: []v1beta1.Step{{Container: corev1.Container{
 					Name:    "name",

test/e2e-tests.sh

@@ -52,11 +52,14 @@ function run_e2e() {
   go_test_e2e -tags=examples -timeout=20m ./test/ || failed=1
 }
 
-set_feature_gate "stable"
-run_e2e
+if [ "$PIPELINE_FEATURE_GATE" == "" ]; then
+  set_feature_gate "stable"
+  run_e2e
+else
+  set_feature_gate "$PIPELINE_FEATURE_GATE"
+  run_e2e
+fi
 
-set_feature_gate "alpha"
-run_e2e
 
 (( failed )) && fail_test
 success