Skip to content

Gha patch reusable workflow #18

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

Merged
merged 2 commits into from
Jul 22, 2025
Merged

Gha patch reusable workflow #18

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
132dc85
Update pages-gh.yml remove traefik rule for researchcomputing.ca, par…
VWJF Jul 22, 2025
7ad18d8
replace template.hcl with .nomad for jobspec readability
VWJF Jul 22, 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
5 changes: 3 additions & 2 deletions .github/workflows/pages-gh.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ jobs:
# __USERNAME__="${{ secrets.GITLAB_CONTAINER_USERNAME }}" \
# __PASSWORD__="${{ secrets.GITLAB_CONTAINER_TOKEN }}" \
# __REGISTRY__="${{ secrets.NOMAD_SERVER_DATACENTERS }}" \
__RESEARCHER__: "${{ secrets.__RESEARCHER__ }}"

steps:
- name: Prepare Environment
Expand Down Expand Up @@ -408,8 +409,8 @@ jobs:
__IMAGE_FORCE_PULL__="${{ env.FORCE_PULL || 'false' }}" \
__DATACENTERS__="${{ env.NOMAD_SERVER_DATACENTERS }}" \
__NAMESPACE__="${{ env.NOMAD_SERVER_NAMESPACE }}" \
envsubst < nomad/template.hcl > ${{ env.SERVICE }}.hcl
cat ${{ env.SERVICE }}.hcl
envsubst < nomad/template.nomad > ${{ env.SERVICE }}.nomad
cat ${{ env.SERVICE }}.nomad

- name: Deploy TIMESTAMPED Website To Nomad
run: NOMAD_TOKEN=${{ secrets.NOMAD_SERVER_TOKEN }} NOMAD_ADDR=${{ secrets.NOMAD_SERVER_ADDRESS }} nomad job run ${{ env.SERVICE }}.hcl
Expand Down
8 changes: 2 additions & 6 deletions nomad/template.hcl → nomad/template.nomad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,8 @@ job "${__SERVICE__}-${__ENVIRONMENT__}" {
"traefik.http.routers.rcg-${__SERVICE__}-${__ENVIRONMENT__}.tls=true",
"traefik.http.routers.rcg-${__SERVICE__}-${__ENVIRONMENT__}.entrypoints=websecure",

"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputing.ca`)",
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}-nossl.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputing.ca`)",
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.tls=true",

"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputinggroup.ca`)",
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}-nossl.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputinggroup.ca`)",
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.${__RESEARCHER__}.researchcomputinggroup.ca`)",
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}-nossl.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.${__RESEARCHER__}.researchcomputinggroup.ca`)",
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.tls=true",
"traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.entrypoints=websecure",
]
Expand Down