diff --git a/.github/assets/php/createImageBuilderDataYaml.php b/.github/assets/php/createImageBuilderDataYaml.php index d8b4bd4..7e58f64 100644 --- a/.github/assets/php/createImageBuilderDataYaml.php +++ b/.github/assets/php/createImageBuilderDataYaml.php @@ -9,6 +9,8 @@ function tabEverything($content, $tab = 7) $scriptBuild = tabEverything(file_get_contents($argv[1])); $scriptValidate = tabEverything(file_get_contents($argv[2])); +$timeout = getenv('IMAGE_BUILDER_STEP_TIMEOUT_SECONDS') ?: '1200'; + $yamlContent = <</dev/null; do @@ -765,7 +825,7 @@ jobs: set -eEBx php "./.github/assets/php/createAlbYaml.php" "${{ env.certificates }}" > ./CloudFormation/alb.yaml cat ./CloudFormation/alb.yaml - sleep 3 + sleep ${{ inputs.albStackPauseSeconds }} ./.github/assets/shell/createUpdateCFStack.sh ${{ matrix.aws-region }} alb \ --template-body file://./CloudFormation/alb.yaml \ --parameters 'ParameterKey=PublicSubnets,ParameterValue="${{ env.publicSubnet }}"' @@ -1057,7 +1117,7 @@ jobs: echo "❌ Cluster failed to become active" exit 1 fi - sleep 30 + sleep ${{ inputs.eksClusterCheckIntervalSeconds }} done - name: Add new node group @@ -1255,7 +1315,7 @@ jobs: aws imagebuilder create-distribution-configuration \ --name ${{ inputs.accountName }}-distribution-configuration \ "${DISTRIBUTION_ARGUMENTS[@]}" - sleep 240 + sleep ${{ inputs.imageBuilderDistributionSleepSeconds }} else aws imagebuilder update-distribution-configuration \ --distribution-configuration-arn \ @@ -1287,6 +1347,7 @@ jobs: IMAGE-BUILDER-VALIDATE-EOF chmod +x ./.github/assets/shell/createUpdateImageBuilder.sh + export IMAGE_BUILDER_STEP_TIMEOUT_SECONDS="${{ inputs.imageBuilderStepTimeoutSeconds }}" ./.github/assets/shell/createUpdateImageBuilder.sh \ "${{ env.distribution }}" \ "${{ matrix.aws-region }}" \ @@ -1471,7 +1532,7 @@ jobs: if: ${{ steps.web.outputs.refresh == '1' && needs.IMAGE-BUILDER.outputs.image_rebuilt == '1' }} run: | REFRESH_ID=$(aws autoscaling start-instance-refresh \ - --preferences '{"InstanceWarmup": 1200, "MinHealthyPercentage": 100}' \ + --preferences '{"InstanceWarmup": ${{ inputs.instanceWarmupSeconds }}, "MinHealthyPercentage": 100}' \ --strategy Rolling \ --auto-scaling-group-name "${{ inputs.environment }}-${{ needs.CONSTANTS.outputs.repositoryNicename }}-${{ env.version }}.${{ github.run_number }}-asg" --output text) @@ -1497,12 +1558,12 @@ jobs: getStatus - sleep 240 + sleep ${{ inputs.instanceRefreshInitialSleepSeconds }} while [[ "$STATUS" == "Pending" || "$STATUS" == "InProgress" ]]; do getLog ${{ env.version }} - echo "Waiting 60 seconds... <$STATUS> (attempt:$TRY)" - sleep 60 + echo "Waiting ${{ inputs.instanceRefreshCheckIntervalSeconds }} seconds... <$STATUS> (attempt:$TRY)" + sleep ${{ inputs.instanceRefreshCheckIntervalSeconds }} getStatus done if [[ "$STATUS" == "Successful" ]]; then