Merge branch 'main' into release-1.300052.0

aws · Jan 22, 2025 · b25d888 · b25d888
2 parents bff4177 + 7b2b664
commit b25d888
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -14,6 +14,8 @@ env:
   OPERATOR_GITHUB_REPO_NAME: "aws/amazon-cloudwatch-agent-operator"
 
 on:
+  schedule:
+    - cron: '0 17 * * 1'
   workflow_dispatch:
     inputs:
       region:
@@ -47,7 +49,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: ${{env.OPERATOR_GITHUB_REPO_NAME}}
-          ref: ${{inputs.operator-branch}}
+          ref: ${{ inputs.operator-branch || 'main' }}
           path: operator-repo
 
       - name: Get latest commit SHA
@@ -73,7 +75,7 @@ jobs:
     needs: [GetLatestOperatorCommitSHA]
     uses: aws/amazon-cloudwatch-agent-operator/.github/workflows/build-and-upload.yml@main
     concurrency:
-      group: ${{ github.workflow }}-operator-${{ inputs.operator-branch}}
+      group: ${{ github.workflow }}-operator-${{ inputs.operator-branch || 'main' }}
       cancel-in-progress: true
     secrets: inherit
     with:
@@ -165,8 +167,8 @@ jobs:
       cloudwatch_agent_tag: ${{ github.sha }}
       cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
       cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
-      region: ${{ inputs.region }}
-      helm_charts_branch: ${{ inputs.helm-charts-branch }}
+      region: ${{ inputs.region || 'us-west-2' }}
+      helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
       terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
       agent_config: resources/cwagent_configs/jvm_tomcat.json
       sample_app: resources/sample_apps/tomcat.yaml
@@ -187,8 +189,8 @@ jobs:
       cloudwatch_agent_tag: ${{ github.sha }}
       cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
       cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
-      region: ${{ inputs.region }}
-      helm_charts_branch: ${{ inputs.helm-charts-branch }}
+      region: ${{ inputs.region || 'us-west-2' }}
+      helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
       terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
       agent_config: resources/cwagent_configs/kafka.json
       sample_app: resources/sample_apps/kafka.yaml
@@ -209,8 +211,8 @@ jobs:
       cloudwatch_agent_tag: ${{ github.sha }}
       cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
       cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
-      region: ${{ inputs.region }}
-      helm_charts_branch: ${{ inputs.helm-charts-branch }}
+      region: ${{ inputs.region || 'us-west-2' }}
+      helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
       terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
       agent_config: resources/cwagent_configs/containerinsights.json
       sample_app: resources/sample_apps/tomcat.yaml