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.

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

Upmerge 0.33 to edge #1563

Merged
merged 8 commits into from
May 23, 2024
Merged

Upmerge 0.33 to edge #1563

merged 8 commits into from
May 23, 2024

Conversation

sk593
Copy link
Contributor

@sk593 sk593 commented May 23, 2024

Upmerging edge with the 0.33 branch

willtsai and others added 8 commits May 23, 2024 11:57
* Make env configurable (#1046)

Signed-off-by: Reshma Abdul Rahim <[email protected]>

* Adding test AKS workflow to v0.32 (#1052)

* Run functional tests every 2 hours and add another workflow that runs… (#1020)

* Run functional tests every 2 hours and add another workflow that runs the tests on AKS instead of k3d

Signed-off-by: ytimocin <[email protected]>

* Triggering workflow

Signed-off-by: ytimocin <[email protected]>

---------

Signed-off-by: ytimocin <[email protected]>

* Removing the run of the AKS workflow on PRs (#1051)

Signed-off-by: ytimocin <[email protected]>

* Update the timeout (30s) for Playwright

Signed-off-by: ytimocin <[email protected]>

---------

Signed-off-by: ytimocin <[email protected]>

* Use retry and update eshop playwright tests to wait for the catalog to appear (#1213)

Signed-off-by: ytimocin <[email protected]>

* update gh to ado sync workflow to use service principals

Signed-off-by: Will Tsai <[email protected]>

---------

Signed-off-by: Reshma Abdul Rahim <[email protected]>
Signed-off-by: ytimocin <[email protected]>
Signed-off-by: Will Tsai <[email protected]>
Signed-off-by: Will <[email protected]>
Co-authored-by: Reshma Abdul Rahim <[email protected]>
Co-authored-by: Yetkin Timocin <[email protected]>
Signed-off-by: sk593 <[email protected]>
Signed-off-by: ytimocin <[email protected]>
Signed-off-by: sk593 <[email protected]>
@sk593 sk593 merged commit b9018d4 into edge May 23, 2024
8 checks passed
@sk593 sk593 deleted the shruku/upmerge-0.33 branch May 23, 2024 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants