10000 Improve caching for Community Integration Tests against Pro by dominikschubert · Pull Request #9114 · localstack/localstack · GitHub
[go: up one dir, main page]
Skip to content

Improve caching for Community Integration Tests against Pro #9114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Sep 12, 2023
Merged

Improve caching for Community Integration Tests against Pro #9114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e78817b
re-enable workflow for master to improve caching
dominikschubert Sep 7, 2023
520da20
wip
dominikschubert Sep 11, 2023
5940189
more explicit caching
dominikschubert Sep 12, 2023
dd6d9a3
add restore keys to partially match cache from master
dominikschubert Sep 12, 2023
ced00f8
stricter matching for restore-keys
dominikschubert Sep 12, 2023
19c24af
add scheduled daily run at 4AM, stricter paths
dominikschubert Sep 12, 2023
7c43e73
fix missing comma
dominikschubert Sep 12, 2023
ff6a78c
fix syntax
dominikschubert Sep 12, 2023
ec6d7c4
trigger additional run
dominikschubert Sep 12, 2023
e82065c
unify hash key calculation between key and restore-keys
dominikschubert Sep 12, 2023
5ccace8
minor change to re-run test
dominikschubert Sep 12, 2023
ef117a1
split caches
dominikschubert Sep 12, 2023
7d1413d
more lenient restore key for venv cache
dominikschubert Sep 12, 2023
6f92a5d
remove group from venv key completely
dominikschubert Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion .github/workflows/tests-pro-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
BB19
1 change: 0 additions & 1 deletion localstack/aws/connect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ def my_patch(fn, self, **kwargs):
patched_kwargs = {
**kwargs,
"WaiterConfig": {
# TODO: make these configurable
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change doesn't seem to be related, but if it's on purpose, it's okay to sneak this one in ;)

"Delay": localstack_config.BOTO_WAITER_DELAY,
"MaxAttempts": localstack_config.BOTO_WAITER_MAX_ATTEMPTS,
**kwargs.get(
Expand Down
0