Skip to content
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

Jump to bottom

small pipeline improvements #7976

Merged
merged 4 commits into from
Mar 27, 2023
Merged

small pipeline improvements #7976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9284ffd
fix renovate / CLA config
alexrashed Mar 27, 2023
ce252b2
fix ASF update action replacements
alexrashed Mar 27, 2023
9097b82
remove misused environment setting
alexrashed Mar 27, 2023
9e3f200
increase timeout for flaky firehose tests
alexrashed Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
],
"enabledManagers": ["dockerfile"],
"docker": {
"pinDigests": true,
"ignorePaths": ["bin/lambda/Dockerfile.nodejs14x", "Dockerfile.rh"]
"pinDigests": true
},
"major": {
"enabled": false
Expand All @@ -23,5 +22,6 @@
"commitMessageTopic": "Docker base image ({{{depName}}}{{#if currentValue}}:{{{currentValue}}}{{/if}}) digest"
}
}
]
],
"reviewers": ["alexrashed"]
}
5 changes: 2 additions & 3 deletions .github/workflows/asf-updates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:

# Store a (multiline-sanitized) list of changed services (compared to the master) in the GitHub Action output "changed-services"
echo "changed-services<<EOF" >> $GITHUB_OUTPUT
echo "$(git diff --name-only origin/master localstack/aws/api/ | sed 's#localstack/aws/api/#- #g' | sed 's#/__init__.py##g' | sed 's/_/-/g' | sed -z 's/\n/%0A/g' | sed -z 's/\r/%0D/g')" >> $GITHUB_OUTPUT
echo "$(git diff --name-only origin/master localstack/aws/api/ | sed 's#localstack/aws/api/#- #g' | sed 's#/__init__.py##g' | sed 's/_/-/g')" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT

- name: Read PR markdown template
Expand All @@ -69,8 +69,7 @@ jobs:
- name: Add changed services to template
if: ${{ success() && steps.check-for-changes.outputs.diff-count != '0' && steps.check-for-changes.outputs.diff-count != '' }}
id: markdown
# TODO upgrade after https://github.com/mad9000/actions-find-and-replace-string/pull/11 has been released
uses: mad9000/actions-find-and-replace-string@2
uses: mad9000/actions-find-and-replace-string@4
with:
source: ${{ steps.template.outputs.content }}
find: '{{ SERVICES }}'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ jobs:
path-to-signatures: "etc/cla-signatures/signatures.json"
path-to-document: "https://github.com/localstack/localstack/blob/master/.github/CLA.md"
branch: "cla-signatures"
allowlist: "localstack-bot,renovate-bot,renovate"
allowlist: "localstack-bot,*[bot]"
lock-pullrequest-aftermerge: false
1 change: 0 additions & 1 deletion .github/workflows/pro-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
defaults:
run:
working-directory: localstack-ext
environment: localstack-ext-tests
env:
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} # used for increased rate-limits when installing packages
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository # skip job if fork PR
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/test_firehose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ def test_firehose_http(

class TestFirehoseIntegration:
@pytest.mark.skip_offline
@pytest.mark.skip("Flaky for now, need to investigate") # TODO: Investigate post V2
def test_kinesis_firehose_elasticsearch_s3_backup(
self,
firehose_client,
Expand Down Expand Up @@ -194,7 +193,8 @@ def check_domain_state():
result = es_client.describe_elasticsearch_domain(DomainName=domain_name)
return not result["DomainStatus"]["Processing"]

assert poll_condition(check_domain_state, 30, 1)
# if ElasticSearch is not yet installed, it might take some time to download the package before starting the domain
assert poll_condition(check_domain_state, 120, 1)

# put kinesis stream record
kinesis_record = {"target": "hello"}
Expand Down Expand Up @@ -288,7 +288,6 @@ def test_kinesis_firehose_incompatible_with_opensearch_2_3(

@pytest.mark.skip_offline
@pytest.mark.parametrize("opensearch_endpoint_strategy", ["domain", "path", "port"])
@pytest.mark.skip("Skipping if CI for now until we know more - post v2")
def test_kinesis_firehose_opensearch_s3_backup(
self,
firehose_client,
Expand Down Expand Up @@ -359,7 +358,8 @@ def check_domain_state():
]
return not result

assert poll_condition(check_domain_state, 30, 1)
# if OpenSearch is not yet installed, it might take some time to download the package before starting the domain
assert poll_condition(check_domain_state, 120, 1)

# put kinesis stream record
kinesis_record = {"target": "hello"}
Expand Down