add bypass and fix nits for upgrade-script-check.sh

Author: dkijania

buildkite/scripts/archive/upgrade-script-check.sh

@@ -10,11 +10,11 @@
 #   upgrade-script-check.sh [OPTIONS]
 #
 # OPTIONS:
-#   -m, --mode MODE     Execution mode: 'default' or 'verbose' (default: default)
-#                       default: Returns exit code 0/1 without error messages
-#                       verbose: Prints error messages and fails with descriptive output
-#   -b, --branch BRANCH Target branch for comparison (default: develop)
-#   -h, --help          Show this help message
+#   -m, --mode MODE                 Execution mode: 'default' or 'verbose' (default: default)
+#                                   default: Returns exit code 0/1 without error messages
+#                                   verbose: Prints error messages and fails with descriptive output
+#   -b, --comparison-branch BRANCH  Target branch for comparison (default: develop)
+#   -h, --help                      Show this help message
 #
 # EXIT CODES:
 #   0: Success (no schema changes or upgrade script exists)
@@ -43,7 +43,7 @@ parse_args() {
                 fi
                 shift 2
                 ;;
-            -b|--branch)
+            -b|--comparison-branch)
                 BRANCH="$2"
                 shift 2
                 ;;
@@ -93,7 +93,7 @@ has_changes() {
     fi
 }
 
-has_changes_in_in_git() {
+has_changes_in_git() {
     local file="$1"
     if ! check_file_exists "$file"; then
         return 1
@@ -155,6 +155,12 @@ main() {
 
     # If schema files changed, verify upgrade script exists
     if [[ "$schema_changed" == "true" ]]; then
+
+        if ./buildkite/scripts/git/check-bypass.sh "!ci-bypass-upgrade-script-check"; then
+            echo "⏭️  Skipping upgrade script check as PR is bypassed"
+            exit 0
+        fi
+
         # Check that all required scripts exist
         for script_path in "${scripts[@]}"; do
             if ! check_file_exists "$script_path"; then
@@ -167,7 +173,7 @@ main() {
             fi
 
             # Check if the upgrade script itself has changes
-            if has_changes_in_in_git "$script_path"; then
+            if has_changes_in_git "$script_path"; then
                 if [[ "$MODE" == "verbose" ]]; then
                     echo "✓ Upgrade script has been modified: $script_path"
                 fi

buildkite/scripts/changelog.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eou pipefail
+
 # This script checks if a changelog entry is required for a given pull request.
 # It compares the current commit with the base branch of the pull request and looks for changes
 # in the specified trigger files. If changes are found, it checks if the required changelog entry
@@ -20,9 +22,6 @@ BASE_PATH=""
 CHANGELOG_FILE=""
 # List of users who can bypass the changelog check by commenting !ci-bypass-changelog
 # separated by space
-GITHUB_USERS_ELIGIBLE_FOR_BYPASS="amc-ie deepthiskumar Trivo25 45930 SanabriaRusso nicc georgeee dannywillems cjjdespres"
-
-BYPASS_PHRASE="!ci-bypass-changelog"
 
 PIPELINE_SLUG="mina-o-1-labs"
 
@@ -75,23 +74,7 @@ if [[ ! "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" ]]; then
     exit 1
 fi
 
-# Check if PR is bypassed by a !ci-bypass-changelog comment
-pip install -r scripts/github/github_info/requirements.txt
-
-COMMENTED_CODE=0
-(python3 scripts/github/github_info is_pr_commented --comment "$BYPASS_PHRASE" \
-  --by $GITHUB_USERS_ELIGIBLE_FOR_BYPASS --pr "$BUILDKITE_PULL_REQUEST") \
-   || COMMENTED_CODE=$?
-
-if [[ "$COMMENTED_CODE" == 0 ]]; then
-    echo "⏭️  Skipping run as PR is bypassed"
-    exit 0
-elif [[ "$COMMENTED_CODE" == 1 ]]; then
-    echo "⚙️  PR is not bypassed. Proceeding with changelog check..."
-else
-    echo "❌ Failed to check PR for being eligible for changelog check bypass"
-    exit 1
-fi
+./buildkite/scripts/git/check-bypass.sh "!ci-bypass-changelog"
 
 REMOTE_BRANCH="origin/${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
 

buildkite/scripts/git/check-bypass.sh

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+# Git Bypass Check Script
+#
+# This script checks if a pull request has been bypassed for certain CI checks
+# by authorized users through GitHub comments.
+#
+# DESCRIPTION:
+#   Verifies if a PR contains a bypass comment (e.g., !ci-bypass-changelog)
+#   made by users who are eligible to bypass CI checks. Uses a Python script
+#   to interact with GitHub API and check for the presence of bypass comments.
+#
+# USAGE:
+#   ./check-bypass.sh <bypass_phrase>
+#
+# ARGUMENTS:
+#   bypass_phrase - The comment phrase to look for (e.g., "!ci-bypass-changelog")
+#
+# ENVIRONMENT VARIABLES:
+#   BUILDKITE_PULL_REQUEST - Pull request number (set by Buildkite)
+#
+# EXIT CODES:
+#   0 - PR is bypassed, skip the check
+#   1 - Error occurred during bypass check
+#   (continues execution if PR is not bypassed)
+#
+# DEPENDENCIES:
+#   - Python 3
+#   - pip packages from scripts/github/github_info/requirements.txt
+#   - scripts/github/github_info Python module
+#
+# AUTHORIZED USERS:
+#   Only users listed in GITHUB_USERS_ELIGIBLE_FOR_BYPASS can bypass checks
+
+GITHUB_USERS_ELIGIBLE_FOR_BYPASS="amc-ie deepthiskumar Trivo25 45930 SanabriaRusso nicc georgeee dannywillems cjjdespres"
+
+BYPASS_PHRASE=$1
+
+
+# Check if PR is bypassed by a !ci-bypass-changelog comment
+pip install -r scripts/github/github_info/requirements.txt
+
+COMMENTED_CODE=0
+(python3 scripts/github/github_info is_pr_commented --comment "$BYPASS_PHRASE" \
+  --by $GITHUB_USERS_ELIGIBLE_FOR_BYPASS --pr "$BUILDKITE_PULL_REQUEST") \
+   || COMMENTED_CODE=$?
+
+if [[ "$COMMENTED_CODE" == 0 ]]; then
+    echo "⏭️  Skipping run as PR is bypassed"
+    exit 0
+elif [[ "$COMMENTED_CODE" == 1 ]]; then
+    echo "⚙️  PR is not bypassed. Proceeding with changelog check..."
+else
+    echo "❌ Failed to check PR for being eligible for changelog check bypass"
+    exit 1
+fi