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

…etic
tektoncd · May 18, 2021 · 3a688ba · 3a688ba
2 parents 14828b8 + 567dce3
commit 3a688ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/docs/pipelines.md b/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`.

diff --git a/test/e2e-tests.sh b/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