Skip to content

add priority group back #255

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

Closed
carmichaelong wants to merge 2 commits into from
Closed

add priority group back #255

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
0cf6661
let dev deploy from other branches via github. limit main redeploymen…
carmichaelong Jun 5, 2025
7187641
add back priority group in dequeue
carmichaelong Jun 6, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/ecr-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ on:
push:
branches:
- dev
workflow_dispatch:

name: DEV ECS build & deployment

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ecr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ on:
branches:
- main
workflow_dispatch:
branches:
- main

name: PRODUCTION ECS build & deployment

Expand Down
7 changes: 5 additions & 2 deletions mcserver/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,8 +1500,11 @@ def dequeue(self, request):
if trials.count() == 0 and trialsReprocess.count() == 0:
raise Http404

# prioritize admin and priority group trials (priority group doesn't exist yet, but should have same priv. as user)
trialsPrioritized = trials.filter(session__user__groups__name__in=["admin","priority"])
# prioritize admin group trials first
trialsPrioritized = trials.filter(session__user__groups__name__in=["admin"])
# if no admin trials, go to priority group trials
if trialsPrioritized.count() == 0:
trialsPrioritized = trials.filter(session__user__groups__name__in=["priority"])
# if not priority trials, go to normal trials
if trialsPrioritized.count() == 0:
trialsPrioritized = trials
Expand Down