Skip to content

Upmerge 0.33 to edge#1563

Merged
sk593 merged 8 commits into
edgefrom
shruku/upmerge-0.33
May 23, 2024
Merged

Upmerge 0.33 to edge#1563
sk593 merged 8 commits into
edgefrom
shruku/upmerge-0.33

Conversation

@sk593
Copy link
Copy Markdown
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 <reshmarahim.abdul@microsoft.com>

* 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 <ytimocin@microsoft.com>

* Triggering workflow

Signed-off-by: ytimocin <ytimocin@microsoft.com>

---------

Signed-off-by: ytimocin <ytimocin@microsoft.com>

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

Signed-off-by: ytimocin <ytimocin@microsoft.com>

* Update the timeout (30s) for Playwright

Signed-off-by: ytimocin <ytimocin@microsoft.com>

---------

Signed-off-by: ytimocin <ytimocin@microsoft.com>

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

Signed-off-by: ytimocin <ytimocin@microsoft.com>

* update gh to ado sync workflow to use service principals

Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com>

---------

Signed-off-by: Reshma Abdul Rahim <reshmarahim.abdul@microsoft.com>
Signed-off-by: ytimocin <ytimocin@microsoft.com>
Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com>
Signed-off-by: Will <28876888+willtsai@users.noreply.github.com>
Co-authored-by: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com>
Co-authored-by: Yetkin Timocin <ytimocin@microsoft.com>
Signed-off-by: sk593 <shruthikumar@microsoft.com>
Signed-off-by: ytimocin <ytimocin@microsoft.com>
Signed-off-by: sk593 <shruthikumar@microsoft.com>
Signed-off-by: ytimocin <ytimocin@microsoft.com>
Signed-off-by: sk593 <shruthikumar@microsoft.com>
Signed-off-by: ytimocin <ytimocin@microsoft.com>
Signed-off-by: sk593 <shruthikumar@microsoft.com>
Signed-off-by: ytimocin <ytimocin@microsoft.com>
Signed-off-by: sk593 <shruthikumar@microsoft.com>
Signed-off-by: ytimocin <ytimocin@microsoft.com>
Signed-off-by: sk593 <shruthikumar@microsoft.com>
Signed-off-by: ytimocin <ytimocin@microsoft.com>
Signed-off-by: sk593 <shruthikumar@microsoft.com>
Signed-off-by: ytimocin <ytimocin@microsoft.com>
Signed-off-by: sk593 <shruthikumar@microsoft.com>
@sk593 sk593 force-pushed the shruku/upmerge-0.33 branch from 7a0a7f8 to 5939e46 Compare May 23, 2024 18:57
@sk593 sk593 merged commit b9018d4 into edge May 23, 2024
@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