cleanups

Signed-off-by: Ryan Northey <ryan@synca.io>
envoyproxy · May 25, 2023 · 2d4fd4b · 2d4fd4b
1 parent 55574a7
commit 2d4fd4b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 30 deletions.
diff --git a/.azure-pipelines/stage/verify.yml b/.azure-pipelines/stage/verify.yml
@@ -50,8 +50,9 @@ jobs:
 
   - template: ../bazel.yml
     parameters:
-      ciTarget: trigger_verify
+      ciTarget: verify.trigger
       authGithub: "$(key.value)"
+      # Please see `ci/do_ci.sh` for notes on required vars.
       env:
         ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
           ENVOY_BRANCH: "$(System.PullRequest.TargetBranch)"

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -679,35 +679,6 @@ case $CI_TARGET in
         bazel_envoy_binary_build sizeopt
         ;;
 
-    trigger_verify)
-        setup_clang_toolchain
-        WORKFLOW="envoy-verify.yml"
-        # This may be a merge commit in a PR
-        COMMIT="$(git rev-parse HEAD)"
-        # For a PR this should be the last actual commit
-        ENVOY_COMMIT="${ENVOY_COMMIT:-${COMMIT}}"
-        ENVOY_REPO="${ENVOY_REPO:-envoyproxy/envoy}"
-        # ENVOY_HEAD_REF must also be set in PRs to provide a unique key for job grouping and cancellation.
-        echo "Trigger workflow (${WORKFLOW})"
-        echo "  Repo: ${ENVOY_REPO}"
-        echo "  Branch: ${ENVOY_BRANCH}"
-        echo "  Inputs:"
-        echo "    ref: ${COMMIT}"
-        echo "    sha: ${ENVOY_COMMIT}"
-        echo "    head_ref: ${ENVOY_HEAD_REF}"
-        GITHUB_APP_KEY="$(echo "$GITHUB_TOKEN" | base64 -d -w0)"
-        export GITHUB_APP_KEY
-        INPUTS="{\"ref\":\"$COMMIT\",\"sha\":\"$ENVOY_COMMIT\",\"head_ref\":\"$ENVOY_HEAD_REF\"}"
-        bazel run "${BAZEL_BUILD_OPTIONS[@]}" \
-              @envoy_repo//:trigger \
-              -- --repo="$ENVOY_REPO" \
-                 --trigger-app-id="$GITHUB_APP_ID" \
-                 --trigger-installation-id="$GITHUB_INSTALL_ID" \
-                 --trigger-ref="$ENVOY_BRANCH" \
-                 --trigger-workflow="$WORKFLOW" \
-                 --trigger-inputs="$INPUTS"
-        ;;
-
     tsan)
         setup_clang_toolchain
         echo "bazel TSAN debug build with tests"
@@ -746,6 +717,39 @@ case $CI_TARGET in
         run_ci_verify "*" "win32-front-proxy|shared"
         ;;
 
+    verify.trigger)
+        setup_clang_toolchain
+        WORKFLOW="envoy-verify.yml"
+        # * Note on vars *
+        # `ENVOY_REPO`: Should always be envoyproxy/envoy unless testing
+        # `ENVOY_BRANCH`: Target branch for PRs, source branch for others
+        # `COMMIT`: This may be a merge commit in a PR
+        # `ENVOY_COMMIT`: The actual last commit of branch/PR
+        # `ENVOY_HEAD_REF`: must also be set in PRs to provide a unique key for job grouping,
+        #   cancellation, and to discriminate from other branch CI
+        COMMIT="$(git rev-parse HEAD)"
+        ENVOY_COMMIT="${ENVOY_COMMIT:-${COMMIT}}"
+        ENVOY_REPO="${ENVOY_REPO:-envoyproxy/envoy}"
+        echo "Trigger workflow (${WORKFLOW})"
+        echo "  Repo: ${ENVOY_REPO}"
+        echo "  Branch: ${ENVOY_BRANCH}"
+        echo "  Ref: ${COMMIT}"
+        echo "  Inputs:"
+        echo "    sha: ${ENVOY_COMMIT}"
+        echo "    head_ref: ${ENVOY_HEAD_REF}"
+        GITHUB_APP_KEY="$(echo "$GITHUB_TOKEN" | base64 -d -w0)"
+        export GITHUB_APP_KEY
+        INPUTS="{\"ref\":\"$COMMIT\",\"sha\":\"$ENVOY_COMMIT\",\"head_ref\":\"$ENVOY_HEAD_REF\"}"
+        bazel run "${BAZEL_BUILD_OPTIONS[@]}" \
+              @envoy_repo//:trigger \
+              -- --repo="$ENVOY_REPO" \
+                 --trigger-app-id="$GITHUB_APP_ID" \
+                 --trigger-installation-id="$GITHUB_INSTALL_ID" \
+                 --trigger-ref="$ENVOY_BRANCH" \
+                 --trigger-workflow="$WORKFLOW" \
+                 --trigger-inputs="$INPUTS"
+        ;;
+
     *)
         echo "Invalid do_ci.sh target (${CI_TARGET}), see ci/README.md for valid targets."
         exit 1