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

Fix CircleCI failures and IT failures #1782

Merged
merged 2 commits into from
Jan 11, 2023
Merged

Fix CircleCI failures and IT failures #1782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f122c7e
Use context for aws credentials
Jan 10, 2023
001a450
Fix TdConfIT failures due to #1778
Jan 11, 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
8 changes: 7 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ jobs:
- run:
name: run IT tests
command: |
export TD_LOAD_IT_S3_ACCESS_KEY_ID=$AWS_RD_DIGDAG_TEST_ACCESS_KEY_ID
export TD_LOAD_IT_S3_SECRET_ACCESS_KEY=$AWS_RD_DIGDAG_TEST_AWS_SECRET_ACCESS_KEY
export EMR_IT_AWS_ACCESS_KEY_ID=$AWS_RD_DIGDAG_TEST_ACCESS_KEY_ID
export EMR_IT_AWS_SECRET_ACCESS_KEY=$AWS_RD_DIGDAG_TEST_AWS_SECRET_ACCESS_KEY
nohup /entrypoint.sh > /dev/null 2>&1 &
sleep 10
ps -awx
Expand Down Expand Up @@ -94,7 +98,9 @@ workflows:

test_and_docs_deployment:
jobs:
- test # will be executed for topic branch not only default branches so that we can safely merge it
- test: # will be executed for topic branch not only default branches so that we can safely merge it
context:
- aws-rd
- docs_deployment: # master branch only
filters:
branches:
Expand Down
6 changes: 3 additions & 3 deletions digdag-tests/src/test/java/acceptance/td/TdConfIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public void verifyCliConfiguresDigdagClientUsingTdConf()

assertThat(requests.isEmpty(), is(false));
for (FullHttpRequest request : requests) {
assertThat(request.getUri(), is("http://foo.baz.bar:80/api/workflows?count=100"));
assertThat(request.getUri(), is("http://foo.baz.bar:80/api/workflows?count=100&order=asc"));
assertThat(request.headers().get(AUTHORIZATION), is("TD1 " + MOCK_TD_API_KEY));
}
}
Expand Down Expand Up @@ -176,7 +176,7 @@ public void verifyCliIgnoresMissingTdConf()

assertThat(requests.isEmpty(), is(false));
for (FullHttpRequest request : requests) {
assertThat(request.getUri(), is("http://baz.quux:80/api/workflows?count=100"));
assertThat(request.getUri(), is("http://baz.quux:80/api/workflows?count=100&order=asc"));
assertThat(request.headers().get(AUTHORIZATION), is("FOO " + MOCK_TD_API_KEY));
}
}
Expand Down Expand Up @@ -204,7 +204,7 @@ public void verifyCliIgnoresBrokenTdConf()

assertThat(requests.isEmpty(), is(false));
for (FullHttpRequest request : requests) {
assertThat(request.getUri(), is("http://baz.quux:80/api/workflows?count=100"));
assertThat(request.getUri(), is("http://baz.quux:80/api/workflows?count=100&order=asc"));
assertThat(request.headers().get(AUTHORIZATION), is("FOO " + MOCK_TD_API_KEY));
}
}
Expand Down