Improve caching for Community Integration Tests against Pro (localstack#9114)

dominikschubert · web-flow · commit 7974a9c063c8 · 2023-09-12T17:05:53.000+02:00
diff --git a/.github/workflows/tests-pro-integration.yml b/.github/workflows/tests-pro-integration.yml
@@ -38,6 +38,18 @@ on:
       - master
       - 'v[0-9]+'
       - release/*
+  schedule:
+    - cron: '0 4 * * *'  # run once a day at 4 AM UTC
+  push:
+    paths:
+      - ".github/workflows/tests-pro-integration.yml"
+      - "localstack/**/packages.py"
+      - "localstack/packages/*.py"
+      - "setup.py"
+      - "pyproject.toml"
+      - "setup.cfg"
+    branches:
+      - master
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -171,9 +183,22 @@ jobs:
         with:
           path: |
             localstack-ext/.venv
+          # include the matrix group (to re-use the var-libs used in the specific test group)
+          key: community-it-${{ runner.os }}-python-${{ steps.setup-python.outputs.python-version }}-venv-${{ hashFiles('localstack-ext/setup.cfg', 'localstack-ext/pyproject.toml', 'localstack/setup.cfg') }}-${{steps.determine-companion-ref.outputs.result}}
+          restore-keys: |
+            community-it-${{ runner.os }}-python-${{ steps.setup-python.outputs.python-version }}-venv-${{ hashFiles('localstack-ext/setup.cfg', 'localstack-ext/pyproject.toml', 'localstack/setup.cfg') }}-refs/heads/master
+
+      - name: Cache Ext Dependencies (libs)
+        if: inputs.disableCaching != true
+        uses: actions/cache@v3
+        with:
+          path: |
             localstack/.filesystem/var/lib/localstack
           # include the matrix group (to re-use the var-libs used in the specific test group)
-          key: community-it-${{ runner.os }}-python-${{ steps.setup-python.outputs.python-version }}-venv-${{ hashFiles('localstack-ext/setup.cfg', 'localstack-ext/pyproject.toml', 'localstack/setup.cfg', '**/packages.py', '**/packages/*') }}-${{steps.determine-companion-ref.outputs.result}}-group-${{ matrix.group }}
+          key: community-it-${{ runner.os }}-python-${{ steps.setup-python.outputs.python-version }}-libs-${{ hashFiles('localstack-ext/**/packages.py','localstack-ext/packages/*.py', 'localstack/**/packages.py',  'localstack/packages/*.py') }}-${{steps.determine-companion-ref.outputs.result}}-group-${{ matrix.group }}
+          restore-keys: |
+            community-it-${{ runner.os }}-python-${{ steps.setup-python.outputs.python-version }}-libs-${{ hashFiles('localstack-ext/**/packages.py','localstack-ext/packages/*.py','localstack/**/packages.py',  'localstack/packages/*.py') }}-refs/heads/master-group-${{ matrix.group }}
+
 
       - name: Restore Lambda common runtime packages
         id: cached-lambda-common-restore
@@ -235,6 +260,7 @@ jobs:
           # add the GitHub API token to avoid rate limit issues
           GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DEBUG: 1
+          DISABLE_BOTO_RETRIES: 1
           DNS_ADDRESS: 0
           LAMBDA_EXECUTOR: "local"
           LOCALSTACK_API_KEY: "test"
diff --git a/localstack/aws/connect.py b/localstack/aws/connect.py
@@ -49,7 +49,6 @@ def my_patch(fn, self, **kwargs):
         patched_kwargs = {
             **kwargs,
             "WaiterConfig": {
-                # TODO: make these configurable
                 "Delay": localstack_config.BOTO_WAITER_DELAY,
                 "MaxAttempts": localstack_config.BOTO_WAITER_MAX_ATTEMPTS,
                 **kwargs.get(
