now utility cleanup for github actions - mac + linux

Author: samirans89

mac/common-utils.sh

@@ -258,6 +258,7 @@ is_domain_private() {
     domain=${domain%%/*}  # remove everything after first "/"
     log_msg_to "Website domain: $domain"
     export NOW_WEB_DOMAIN="$CX_TEST_URL"
+    export CX_TEST_URL="$CX_TEST_URL"
 
     # Resolve domain using Cloudflare DNS
     IP_ADDRESS=$(dig +short "$domain" @1.1.1.1 | head -n1)
@@ -277,7 +278,6 @@ is_domain_private() {
 
 identify_run_status_java() {
     local log_file=$1
-    log_section "✅ Results"
     local line=""
     # Extract the test summary line
     line=$(grep -m 2 -E "[INFO|ERROR].*Tests run" < "$log_file")
@@ -367,29 +367,29 @@ clear_old_logs() {
 
 
 detect_os() {
-  local unameOut=""
-  unameOut="$(uname -s 2>/dev/null | tr '[:upper:]' '[:lower:]')"
-  local response=""
-  case "$unameOut" in
-    linux*)
-      # Detect WSL vs normal Linux
-      if grep -qi "microsoft" /proc/version 2>/dev/null; then
-        response="wsl"
-      else
-        response="linux"
-      fi
-      ;;
-    darwin*)
-      response="macos"
-      ;;
-    msys*|mingw*|cygwin*)
-      response="windows"
-      ;;
-    *)
-      response="unknown"
-      ;;
-  esac
-
-  export NOW_OS=$response
+    local unameOut=""
+    unameOut="$(uname -s 2>/dev/null | tr '[:upper:]' '[:lower:]')"
+    local response=""
+    case "$unameOut" in
+        linux*)
+            # Detect WSL vs normal Linux
+            if grep -qi "microsoft" /proc/version 2>/dev/null; then
+                response="wsl"
+            else
+                response="linux"
+            fi
+            ;;
+        darwin*)
+            response="macos"
+            ;;
+        msys*|mingw*|cygwin*)
+            response="windows"
+            ;;
+        *)
+            response="unknown"
+            ;;
+    esac
+    
+    export NOW_OS=$response
 }
 

mac/detect-os.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+detect_os() {
+    local unameOut=""
+    unameOut="$(uname -s 2>/dev/null | tr '[:upper:]' '[:lower:]')"
+    local response=""
+    case "$unameOut" in
+        linux*)
+            # Detect WSL vs normal Linux
+            if grep -qi "microsoft" /proc/version 2>/dev/null; then
+                response="wsl"
+            else
+                response="linux"
+            fi
+            ;;
+        darwin*)
+            response="macos"
+            ;;
+        msys*|mingw*|cygwin*)
+            response="windows"
+            ;;
+        *)
+            response="unknown"
+            ;;
+    esac
+    echo "OS is: $response"
+    export NOW_OS=$response
+}
+
+detect_os
+

mac/device-machine-allocation.sh

@@ -116,7 +116,15 @@ pick_terminal_devices() {
     entry="${matching_devices[$index]}"
     suffixEntry="${entry#*|}"
     prefixEntry="${entry%%|*}"
+    bVersionLiteral=""
+    mod=$(( i % 4 ))
 
+    if [ $((i % 4)) -ne 0 ]; then
+      bVersionLiteral="-$mod"
+    else
+      bVersionLiteral=""
+    fi
+    bVersion="latest$bVersionLiteral"
     if [[ "$platformsListContentFormat" == "yaml" ]]; then
       if [[ "$prefixEntry" == "android" || "$prefixEntry" == "ios" ]]; then  
         yaml+="  - platformName: $prefixEntry
@@ -125,7 +133,7 @@ pick_terminal_devices() {
       else
         yaml+="  - osVersion: $prefixEntry
     browserName: $suffixEntry
-    browserVersion: latest
+    browserVersion: $bVersion
 "
       fi
 
@@ -139,7 +147,7 @@ pick_terminal_devices() {
       if [[ "$prefixEntry" == "android" || "$prefixEntry" == "ios" ]]; then
         json+=$'{"platformName": "'"$prefixEntry"'","bstack:options":{"deviceName": "'"$suffixEntry"'"}},'
       else
-        json+=$'{"bstack:options":{ "os": "'"$prefixEntry"'"},"browserName": "'"$suffixEntry"'","browserVersion": "latest"},'
+        json+=$'{"bstack:options":{ "os": "'"$prefixEntry"'"},"browserName": "'"$suffixEntry"'","browserVersion": "'"$bVersion"'"},'
       fi
 
       # Stop if max reached

mac/env-setup-run.sh

@@ -2,7 +2,7 @@
 # shellcheck shell=bash
 
 setup_environment() {
-    local setup_type=$1  
+    local setup_type=$1
     local tech_stack=$2
     local max_parallels
 
@@ -51,7 +51,7 @@ setup_environment() {
             check_return_value $? "$NOW_RUN_LOG_FILE" "${setup_type} setup succeeded." "❌ ${setup_type} setup failed. Check $log_file for details"
         ;;
         *)
-            log_warn "Unknown TECH_STACK: $TECH_STACK" "$NOW_RUN_LOG_FILE"
+            log_warn "Unknown TECH_STACK: $tech_stack" "$NOW_RUN_LOG_FILE"
             return 1
         ;;
     esac
@@ -65,7 +65,7 @@ setup_web_java() {
     TARGET_DIR="$WORKSPACE_DIR/$PROJECT_FOLDER/$REPO"
 
     mkdir -p "$WORKSPACE_DIR/$PROJECT_FOLDER"
-
+    
     clone_repository "$REPO" "$TARGET_DIR"
 
     cd "$TARGET_DIR"|| return 1
@@ -91,19 +91,19 @@ platforms:
 $platform_yaml
 EOF
 
-    export BSTACK_PARALLELS=$parallels 
+    export BSTACK_PARALLELS=$parallels
     export BSTACK_PLATFORMS=$platform_yaml
-    export BROWSERSTACK_LOCAL=$local_flag 
+    export BROWSERSTACK_LOCAL=$local_flag
     export BROWSERSTACK_BUILD_NAME="now-$NOW_OS-web-java-testng"
-    export BROWSERSTACK_PROJECT_NAME="now-$NOW_OS-app"
-
+    export BROWSERSTACK_PROJECT_NAME="now-$NOW_OS-web"
+    
     # === 6️⃣ Build and Run ===
     log_msg_to "⚙️ Running 'mvn install -DskipTests'"
     log_info "Installing dependencies"
     mvn install -DskipTests >> "$NOW_RUN_LOG_FILE" 2>&1 || return 1
     log_success "Dependencies installed"
-
-
+    
+    
     log_section "Validate Environment Variables"
     log_info "BrowserStack Username: $BROWSERSTACK_USERNAME"
     log_info "BrowserStack Build: $BROWSERSTACK_BUILD_NAME"
@@ -134,7 +134,7 @@ setup_app_java() {
     TARGET_DIR="$WORKSPACE_DIR/$PROJECT_FOLDER/$REPO"
     local app_url=$BROWSERSTACK_APP
     log_msg_to "APP_PLATFORM: $APP_PLATFORM" >> "$NOW_RUN_LOG_FILE" 2>&1
-
+    
     clone_repository "$REPO" "$TARGET_DIR"
 
     if [[ "$APP_PLATFORM" == "all" || "$APP_PLATFORM" == "android" ]]; then
@@ -169,7 +169,7 @@ EOF
         return 1 # Fail the function if clean fails
     fi
     log_success "Dependencies installed"
-
+    
     log_section "Validate Environment Variables"
     log_info "BrowserStack Username: $BROWSERSTACK_USERNAME"
     log_info "BrowserStack Build: $BROWSERSTACK_BUILD_NAME"
@@ -195,38 +195,40 @@ setup_web_python() {
     local parallels=$2
     local log_file=$3
 
-    REPO="browserstack-examples-pytest"
+    REPO="now-pytest-browserstack"
     TARGET_DIR="$WORKSPACE_DIR/$PROJECT_FOLDER/$REPO"
 
-    clone_repository "$REPO" "$TARGET_DIR"
+    clone_repository "$REPO" "$TARGET_DIR" ""
 
     detect_setup_python_env
 
     pip3 install -r requirements.txt >> "$NOW_RUN_LOG_FILE" 2>&1
     log_success "Dependencies installed"
 
     # Update YAML at root level (browserstack.yml)
-    export BROWSERSTACK_CONFIG_FILE="./src/conf/browserstack_parallel.yml"
+    export BROWSERSTACK_CONFIG_FILE="./browserstack.yml"
     platform_yaml=$(generate_web_platforms "$TEAM_PARALLELS_MAX_ALLOWED_WEB" "yaml")
     export BSTACK_PLATFORMS=$platform_yaml
       cat >> "$BROWSERSTACK_CONFIG_FILE" <<EOF
-
 platforms:
 $platform_yaml
 EOF
 
     if is_domain_private; then
         local_flag=true
+    else
+        local_flag=false
     fi
 
+    
     export BSTACK_PARALLELS=1
     export BROWSERSTACK_LOCAL=$local_flag
     export BSTACK_PLATFORMS=$platform_yaml
     export BROWSERSTACK_BUILD_NAME="now-$NOW_OS-web-python-pytest"
     export BROWSERSTACK_PROJECT_NAME="now-$NOW_OS-web"
 
     report_bstack_local_status "$local_flag"
-
+    
     log_section "Validate Environment Variables"
     log_info "BrowserStack Username: $BROWSERSTACK_USERNAME"
     log_info "BrowserStack Build: $BROWSERSTACK_BUILD_NAME"
@@ -236,15 +238,12 @@ EOF
     log_info "Platforms: \n$BSTACK_PLATFORMS"
 
 
-    print_tests_running_log_section "browserstack-sdk pytest -s src/test/suites/*.py --browserstack.config ./src/conf/browserstack_parallel.yml"
-    log_msg_to "🚀 Running 'browserstack-sdk pytest -s tests/bstack-sample-test.py'. This could take a few minutes. Follow the Automaton build here: https://automation.browserstack.com/"
+    print_tests_running_log_section "browserstack-sdk pytest -s tests/*.py"
+    log_msg_to "🚀 Running 'browserstack-sdk pytest -s tests/*.py'. This could take a few minutes. Follow the Automaton build here: https://automation.browserstack.com/"
     # Run tests
-    browserstack-sdk pytest -s src/test/suites/*.py --browserstack.config ./src/conf/browserstack_parallel.yml >> "$NOW_RUN_LOG_FILE" 2>&1
-    # &
-    # cmd_pid=$!|| return 1
-    
-    # show_spinner "$cmd_pid"
-    # wait "$cmd_pid"
+    browserstack-sdk pytest -s tests/*.py >> "$NOW_RUN_LOG_FILE" 2>&1 & cmd_pid=$!|| return 1
+    show_spinner "$cmd_pid"
+    wait "$cmd_pid"
 
     cd "$WORKSPACE_DIR/$PROJECT_FOLDER" || return 1
     return 0
@@ -289,7 +288,7 @@ EOF
     export BROWSERSTACK_LOCAL=true
     export BROWSERSTACK_BUILD_NAME="now-$NOW_OS-app-python-pytest"
     export BROWSERSTACK_PROJECT_NAME="now-$NOW_OS-app"
-
+    
     log_section "Validate Environment Variables"
     log_info "BrowserStack Username: $BROWSERSTACK_USERNAME"
     log_info "BrowserStack Build: $BROWSERSTACK_BUILD_NAME"
@@ -319,7 +318,7 @@ setup_web_nodejs() {
     mkdir -p "$WORKSPACE_DIR/$PROJECT_FOLDER"
 
     clone_repository "$REPO" "$TARGET_DIR"
-
+    
 
     # === 2️⃣ Install Dependencies ===
     log_msg_to "⚙️ Running 'npm install'"
@@ -342,14 +341,14 @@ setup_web_nodejs() {
     export BROWSERSTACK_PROJECT_NAME="now-$NOW_OS-web"
 
     report_bstack_local_status "$local_flag"
-
+    
     log_section "Validate Environment Variables"
     log_info "BrowserStack Username: $BROWSERSTACK_USERNAME"
     log_info "BrowserStack Build: $BROWSERSTACK_BUILD_NAME"
     log_info "Web Application Endpoint: $CX_TEST_URL"
     log_info "BrowserStack Local Flag: $BROWSERSTACK_LOCAL"
     log_info "Parallels per platform: $BSTACK_PARALLELS"
-    log_info "Platforms: \n$BSTACK_CAPS_JSON"    
+    log_info "Platforms: \n$BSTACK_CAPS_JSON"
 
     # === 8️⃣ Run Tests ===
     log_msg_to "🚀 Running 'npm run test'. This could take a few minutes. Follow the Automaton build here: https://automation.browserstack.com/"
@@ -396,7 +395,7 @@ setup_app_nodejs() {
     export BROWSERSTACK_APP=$app_url
     export BROWSERSTACK_BUILD_NAME="now-$NOW_OS-app-nodejs-wdio"
     export BROWSERSTACK_PROJECT_NAME="now-$NOW_OS-app"
-
+    
     log_section "Validate Environment Variables"
     log_info "BrowserStack Username: $BROWSERSTACK_USERNAME"
     log_info "BrowserStack Build: $BROWSERSTACK_BUILD_NAME"
@@ -422,14 +421,24 @@ setup_app_nodejs() {
 }
 
 clone_repository() {
-    repo_git=$1
-    install_folder=$2
-    test_folder=$3
-
+    local repo_git=$1
+    local install_folder=$2
+    local test_folder=$3
+    local git_branch=$4
+    
     rm -rf "$install_folder"
     log_msg_to "📦 Cloning repo $repo_git into $install_folder"
     log_info "Cloning repository: $repo_git"
-    git clone https://github.com/BrowserStackCE/$repo_git.git "$install_folder" >> "$NOW_RUN_LOG_FILE"  2>&1 || return 1
+    # git clone https://github.com/BrowserStackCE/"$repo_git".git "$install_folder" >> "$NOW_RUN_LOG_FILE"  2>&1 || return 1
+    if [ -z "$git_branch" ]; then
+        # git_branch is null or empty
+        git clone "https://github.com/BrowserStackCE/$repo_git.git" \
+        "$install_folder" >> "$NOW_RUN_LOG_FILE" 2>&1 || return 1
+    else
+        # git_branch has a value
+        git clone -b "$git_branch" "https://github.com/BrowserStackCE/$repo_git.git" \
+        "$install_folder" >> "$NOW_RUN_LOG_FILE" 2>&1 || return 1
+    fi
     log_msg_to "✅ Cloned repository: $repo_git into $install_folder"
     cd "$install_folder/$test_folder" || return 1
 }

mac/run.sh

@@ -68,8 +68,11 @@ log_msg_to "Checking proxy in environment"
 set_proxy_in_env
 
 log_section "🧹 Getting Ready"
-log_info "Clearing old logs..."
+detect_os
+log_info "Detected Operating system: $NOW_OS"
+log_info "Clearing old logs fron NOW Home Directory inside .browserstack"
 
 clear_old_logs
+
 log_info "Starting $TEST_TYPE setup for $TECH_STACK"
 run_setup "$TEST_TYPE" "$TECH_STACK"

mac/user-interaction.sh

@@ -69,18 +69,17 @@ get_test_url() {
     fi
 
     export CX_TEST_URL="$test_url"
-    log_msg_to "Exported TEST_URL=$TEST_URL" 
+    log_msg_to "Exported TEST_URL $CX_TEST_URL" 
 }
 
 
 get_test_type() {
-    local run_mode=$1
     local test_type=""
     if [[ "$RUN_MODE" == *"--silent"* || "$RUN_MODE" == *"--debug"* ]]; then
         test_type=$TT
         log_msg_to "✅ Selected Testing Type from environment: $TEST_TYPE" 
     else
-        test_type=$(osascript -e 'Tell application "System Events" to display dialog "Select testing type:" buttons {"web", "app", "both"} default button "web" with title "Testing Type"' \
+        test_type=$(osascript -e 'Tell application "System Events" to display dialog "Select testing type:" buttons {"web", "app"} default button "web" with title "Testing Type"' \
         -e 'button returned of result')
         log_msg_to "✅ Selected Testing Type: $TEST_TYPE" 
         RUN_MODE=$test_type