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

Manual DTS #54498

Merged
merged 11 commits into from
Oct 25, 2023
Merged

Manual DTS #54498

merged 11 commits into from
Oct 25, 2023

Conversation

jmkulwik
Copy link
Contributor

The automated DTS ran into a merge conflict. Doing the merge from the command line did not hit the same conflict.

Actions taken to create this branch

git fetch
git checkout origin/staging
git checkout -b jmkulwik/merge-check
git merge origin/levelbuilder
git push --set-upstream origin jmkulwik/merge-check

Links

Testing story

Deployment strategy

Follow-up work

Privacy

Security

Caching

PR Checklist:

  • Tests provide adequate coverage
  • Privacy and Security impacts have been assessed
  • Code is well-commented
  • New features are translatable or updates will not break translations
  • Relevant documentation has been added or updated
  • User impact is well-understood and desirable
  • Pull Request is labeled appropriately
  • Follow-up work items (including potential tech debt) are tracked and linked

deploy-code-org and others added 11 commits October 24, 2023 02:32
DTT (Staging > Test) [robo-dtt]
DTT (Staging > Test) [robo-dtt]
* empty commit, just to start a new production build

* Restart build to trigger creation of AMI (#49985)

* empty commit just to trigger a new AMI Builder image with correct dashboard and pegasus systemctl symlinks (#54400)

* again empty commit just to trigger a new AMI Builder image with correct dashboard and pegasus systemctl symlinks

---------

Co-authored-by: Meg Crenshaw <meg@code.org>
Co-authored-by: Molly Moen <molly@code.org>
Co-authored-by: Turner Riley <56283563+TurnerRiley@users.noreply.github.com>
Co-authored-by: suresh <suresh@code.org>
Co-authored-by: Erin Peach <erin@code.org>
Co-authored-by: Hannah Bergam <hannah.bergam@code.org>
Co-authored-by: Madelyn Kasula <maddie.kasula@code.org>
Co-authored-by: Dayne <dayne@code.org>
Co-authored-by: Sanchit Malhotra <85528507+sanchitmalhotra126@users.noreply.github.com>
Co-authored-by: Ryan Shipp <1382374+rshipp@users.noreply.github.com>
Co-authored-by: Brendan Reville <breville@users.noreply.github.com>
Co-authored-by: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com>
Co-authored-by: Mike Harvey <43474485+mikeharv@users.noreply.github.com>
Co-authored-by: Pablo M <108825710+pablo-code-org@users.noreply.github.com>
Co-authored-by: Nick Lathe <nick.lathe@code.org>
Co-authored-by: Dave Bailey <davidsbailey@users.noreply.github.com>
Co-authored-by: Dani LaMarca <dani@code.org>
Co-authored-by: Emily Eastlake <emily.eastlake@code.org>
Co-authored-by: Mario Gil Correa <66776217+mgc1194@users.noreply.github.com>
Co-authored-by: fisher-alice <107423305+fisher-alice@users.noreply.github.com>
Co-authored-by: wilkie <david.wilkinson@code.org>
Co-authored-by: Jessica Kulwik <jessica@code.org>
Co-authored-by: Vijaya Manohararaj <124813947+vijayamanohararaj@users.noreply.github.com>
Co-authored-by: bencodeorg <ben@code.org>
Co-authored-by: Jim Thomason <jim@japanesewartuba.com>
Co-authored-by: annaxuphoto <anna@code.org>
Co-authored-by: Erin Ferreirae <131800576+elf-code@users.noreply.github.com>
Co-authored-by: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com>
Co-authored-by: Kaitie O <kaitie@code.org>
Co-authored-by: Darin Webb <darin@code.org>
Co-authored-by: Eric Aderhold <eric.aderhold@code.org>
DTT (Staging > Test) [robo-dtt]
DTT (Staging > Test) [robo-dtt]
DTT (Staging > Test) [robo-dtt]
DTT (Staging > Test) [robo-dtt]
@jmkulwik jmkulwik requested a review from a team as a code owner October 25, 2023 21:02
@jmkulwik jmkulwik merged commit 8a4a551 into staging Oct 25, 2023
1 of 2 checks passed
@jmkulwik jmkulwik deleted the jmkulwik/merge-check branch October 25, 2023 21:02
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.

None yet

3 participants