better ci and correct timeout

Author: jshiwamV

.github/workflows/test-aws.yml

@@ -49,6 +49,8 @@ jobs:
     runs-on: ubuntu-latest
     # Note: Triggered automatically when approved PRs enter GitHub's merge queue
     # Smart path filtering ensures tests run only when AWS infrastructure changes
+    env:
+      DURATION_SECONDS: 14400 # 4 hours
 
     steps:
       - name: Checkout code
@@ -61,7 +63,7 @@ jobs:
           role-session-name: GitHubActions-AWS-Tests
           aws-region: ${{ vars.AWS_REGION || 'us-east-1' }}
           # Max duration of the role is 8 hours as per IAM role configuration in .github/setup/aws/main.tf
-          role-duration-seconds: 14400 # 4 hours
+          role-duration-seconds: ${{ env.DURATION_SECONDS }}
 
       - name: Verify AWS Authentication
         run: |
@@ -102,4 +104,4 @@ jobs:
           SKIP_setup_materialize_disk_disabled: ${{ github.event.inputs.test_stage == 'network-only' && 'true' || '' }}
         run: |
           echo "Running tests"
-          go test -timeout 240m -run TestStagedDeploymentSuite -v
+          go test -timeout ${{ env.DURATION_SECONDS }}s -run TestStagedDeploymentSuite -v

.github/workflows/test-azure.yml

@@ -48,6 +48,8 @@ jobs:
   test-azure:
     name: Azure Infrastructure Tests
     runs-on: ubuntu-latest
+    env:
+      DURATION_SECONDS: 14400 # 4 hours
 
     steps:
       - name: Checkout code
@@ -59,6 +61,8 @@ jobs:
           role-to-assume: ${{ vars.GA_AWS_IAM_ROLE }}
           role-session-name: GitHubActions-Azure-S3Backend
           aws-region: ${{ vars.TF_TEST_S3_REGION || 'us-east-1' }}
+          # Max duration of the role is 8 hours as per IAM role configuration in .github/setup/aws/main.tf
+          role-duration-seconds: ${{ env.DURATION_SECONDS }}
 
       - name: Verify AWS Authentication (for S3 backend)
         run: |
@@ -122,4 +126,4 @@ jobs:
           echo ""
           echo "🧪 Starting Go tests..."
 
-          go test -timeout 240m -run TestStagedDeploymentSuite -v -count=1
+          go test -timeout ${{ env.DURATION_SECONDS }}s -run TestStagedDeploymentSuite -v

.github/workflows/test-gcp.yml

@@ -47,6 +47,8 @@ jobs:
   test-gcp:
     name: GCP Infrastructure Tests
     runs-on: ubuntu-latest
+    env:
+      DURATION_SECONDS: 14400 # 4 hours
 
     steps:
       - name: Checkout code
@@ -58,13 +60,15 @@ jobs:
           role-to-assume: ${{ vars.GA_AWS_IAM_ROLE }}
           role-session-name: GitHubActions-GCP-S3Backend
           aws-region: ${{ vars.TF_TEST_S3_REGION || 'us-east-1' }}
+          # Max duration of the role is 8 hours as per IAM role configuration in .github/setup/aws/main.tf
+          role-duration-seconds: ${{ env.DURATION_SECONDS }}
 
       - name: Authenticate to Google Cloud (Service Account Impersonation)
         uses: google-github-actions/auth@v2
         with:
           workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
           service_account: ${{ secrets.GCP_SERVICE_ACCOUNT_EMAIL }}
-          access_token_lifetime: 14400s # 4 hours for long-running tests
+          access_token_lifetime: ${{ env.DURATION_SECONDS }}s # 4 hours for long-running tests
 
       - name: Set up Cloud SDK
         uses: google-github-actions/setup-gcloud@v2
@@ -120,4 +124,4 @@ jobs:
           echo ""
           echo "🧪 Starting Go tests..."
 
-          go test -timeout 240m -run TestStagedDeploymentSuite -v -count=1
+          go test -timeout ${{ env.DURATION_SECONDS }}s -run TestStagedDeploymentSuite -v

test/gcp/staged_deployment_test.go

@@ -332,7 +332,6 @@ func (suite *StagedDeploymentSuite) setupMaterializeConsolidatedStage(stage, sta
 
 		// GKE Configuration
 		"namespace":             TestGKENamespace,
-		"skip_nodepool":         false,
 		"materialize_node_type": machineType,
 		"min_nodes":             TestGKEMinNodes,
 		"max_nodes":             TestGKEMaxNodes,
@@ -367,7 +366,6 @@ func (suite *StagedDeploymentSuite) setupMaterializeConsolidatedStage(stage, sta
 		// Storage Configuration
 		"storage_bucket_versioning":  TestStorageBucketVersioning,
 		"storage_bucket_version_ttl": TestStorageBucketVersionTTL,
-		"enable_bucket_encryption":   true,
 
 		// Cert Manager Configuration
 		"cert_manager_install_timeout": TestCertManagerInstallTimeout,