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

Seperate versions between moduletest and main #403

Merged
merged 5 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions infrastructure/dpladm/bin/sync-site.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@ function getSiteDplCmsRelease {
return
}


function getWebmasterDplCmsRelease {
local wmRelease
wmRelease=$(yq eval ".sites.${1}.moduletest-dpl-cms-release" "${2}")
if [[ "${wmRelease}" == "null" ]]; then
echo ""
return
fi

echo "${wmRelease}"
return
}

function getSiteReleaseImageRepository {
local repository
repository=$(yq eval ".sites.${1}.releaseImageRepository" "${2}")
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/environments/dplplat01/sites.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ sites:
releaseImageName: dpl-cms-source
dpl-cms-release: "2024.35.1"
plan: webmaster
moduletest-dpl-cms-release: "2024.32.1"
deploy_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIhuA0K7CNvRoe+Xx7RaXG4+a8KcSpzuWn+G4sUPzNWx"
cms-school:
name: "CMS-skole"
Expand All @@ -38,6 +39,7 @@ sites:
description: "Eksempel på bibliotek der kører på 'webmaster' plan, og derfor har et modultest-miljø"
deploy_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILj8lXv7C/7s7te9sEpwcHQhgDWfzsCkAN7rqQ4sdTzk"
plan: webmaster
moduletest-dpl-cms-release: "2024.32.1"
<<: *default-release-image-source
# Production sites
aabenraa:
Expand Down Expand Up @@ -461,7 +463,6 @@ sites:
- nginx.main.kobenhavn.dplplat01.dpl.reload.dk
- varnish.main.kobenhavn.dplplat01.dpl.reload.dk
plan: webmaster
webmaster-cms-version: 2024.27.1
deploy_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHaTkDvjLW/b2qVj8FIvtX9x3TxFFZTENn+w2CFELeoC"
<<: *webmaster-release-image-source
koge:
Expand Down