From ca503ad9ca18b8c3857a3194b523aff48ba79ab5 Mon Sep 17 00:00:00 2001 From: Joel Addison Date: Thu, 31 Jul 2025 23:25:43 +1000 Subject: [PATCH] Setup Everything Open 2026 --- .gitlab-ci.yml | 28 ++++++++-------- fixtures/conference.json | 8 ++--- fixtures/sessions/conference.section.json | 4 +-- fixtures/sites.json | 4 +-- k8s/deployment_template.jsonnet | 2 +- .../registrasion/migrations/0001_initial.py | 2 ++ pinaxcon/settings.py | 16 ++++----- pinaxcon/templates/nav.html | 2 +- pinaxcon/templates/site_base.html | 15 +++++---- static/src/img/eo2025.svg | 1 - static/src/img/eo2026.svg | 33 +++++++++++++++++++ vendor/registrasion/registrasion/views.py | 2 +- vendor/symposion/schedule/views.py | 2 +- 13 files changed, 77 insertions(+), 42 deletions(-) delete mode 100644 static/src/img/eo2025.svg create mode 100644 static/src/img/eo2026.svg diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37145d0b..3a74f057 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: DOCKER_TLS_CERTDIR: "/certs" - CONTAINER_PREFIX: 2025 + CONTAINER_PREFIX: 2026 CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/$CONTAINER_PREFIX:$CI_COMMIT_SHA build-image: @@ -18,8 +18,8 @@ build-image: - docker build --pull -f docker/Dockerfile -t $CONTAINER_IMAGE . - docker push $CONTAINER_IMAGE only: - - dev/2025 - - conf/2025 + - dev/2026 + - conf/2026 k8s-deploy-staging: image: google/cloud-sdk @@ -27,15 +27,15 @@ k8s-deploy-staging: script: - echo "${CA_CERT}" > cert.crt - kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=cert.crt - - kubectl config set-context cluster --cluster=cluster --namespace=eo2025-staging --user=gitlab-ci + - kubectl config set-context cluster --cluster=cluster --namespace=eo2026-staging --user=gitlab-ci - kubectl config use-context cluster - kubectl --token "${KUBE_TOKEN}" set image deployment/symposion-app symposion-app=$CONTAINER_IMAGE when: manual only: - - dev/2025 + - dev/2026 environment: - name: 2025/staging - url: https://eo2025-staging.osaconftools.net/ + name: 2026/staging + url: https://eo2026-staging.osaconftools.net/ k8s-deploy-prod: image: google/cloud-sdk @@ -43,15 +43,15 @@ k8s-deploy-prod: script: - echo "${CA_CERT}" > cert.crt - kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=cert.crt - - kubectl config set-context cluster --cluster=cluster --namespace=eo2025-prod --user=gitlab-ci + - kubectl config set-context cluster --cluster=cluster --namespace=eo2026-prod --user=gitlab-ci - kubectl config use-context cluster - kubectl --token "${KUBE_TOKEN}" set image deployment/symposion-app symposion-app=$CONTAINER_IMAGE when: manual only: - - conf/2025 + - conf/2026 environment: - name: 2025/prod - url: https://2025.everythingopen.au/ + name: 2026/prod + url: https://2026.everythingopen.au/ .docs_template: &sphinx image: alpine @@ -71,7 +71,7 @@ pages: stage: build only: - master - - conf/2025 + - conf/2026 environment: name: docs url: https://laconfdev.gitlab.io/symposion_app/ @@ -81,5 +81,5 @@ build-sphinx: stage: build except: - master - - conf/2025 - - dev/2025 + - conf/2026 + - dev/2026 diff --git a/fixtures/conference.json b/fixtures/conference.json index a8fd6a85..8fcb70a6 100644 --- a/fixtures/conference.json +++ b/fixtures/conference.json @@ -3,10 +3,10 @@ "model": "symposion_conference.conference", "pk": 1, "fields": { - "title": "Everything Open 2025", - "start_date": "2025-01-20", - "end_date": "2025-01-22", - "timezone": "Australia/Adelaide" + "title": "Everything Open 2026", + "start_date": "2026-01-21", + "end_date": "2026-01-23", + "timezone": "Australia/Sydney" } } ] diff --git a/fixtures/sessions/conference.section.json b/fixtures/sessions/conference.section.json index 9e8da9e3..f8a3b7d0 100644 --- a/fixtures/sessions/conference.section.json +++ b/fixtures/sessions/conference.section.json @@ -6,8 +6,8 @@ "conference": 1, "name": "Main Conference", "slug": "main", - "start_date": "2025-01-20", - "end_date": "2025-01-22" + "start_date": "2026-01-21", + "end_date": "2026-01-23" } } ] diff --git a/fixtures/sites.json b/fixtures/sites.json index cf76c1c8..cbf7360d 100644 --- a/fixtures/sites.json +++ b/fixtures/sites.json @@ -3,8 +3,8 @@ "model": "sites.site", "pk": 1, "fields": { - "domain": "2025.everythingopen.au", - "name": "Everything Open 2025" + "domain": "2026.everythingopen.au", + "name": "Everything Open 2026" } } ] diff --git a/k8s/deployment_template.jsonnet b/k8s/deployment_template.jsonnet index 835294ab..1f7f8d87 100644 --- a/k8s/deployment_template.jsonnet +++ b/k8s/deployment_template.jsonnet @@ -121,7 +121,7 @@ function (slug, sha) { "value": "UA-000000000-1" } ], - "image": "registry.gitlab.com/laconfdev/symposion_app/2025:" + sha, + "image": "registry.gitlab.com/laconfdev/symposion_app/2026:" + sha, "imagePullPolicy": "Always", "livenessProbe": { "failureThreshold": 3, diff --git a/pinaxcon/registrasion/migrations/0001_initial.py b/pinaxcon/registrasion/migrations/0001_initial.py index 830227dd..2b30ea5c 100644 --- a/pinaxcon/registrasion/migrations/0001_initial.py +++ b/pinaxcon/registrasion/migrations/0001_initial.py @@ -32,6 +32,8 @@ _PAST_EVENTS = ( (2021, "LCA2021 Online"), (2022, "LCA2022 Online"), (2023, "EO2023 Melbourne"), + (2024, "EO2024 Gladstone"), + (2025, "EO2025 Adelaide"), ) diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 4d448872..3e2a740d 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -125,7 +125,7 @@ else: ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*'] -TIME_ZONE = "Australia/Adelaide" +TIME_ZONE = "Australia/Sydney" DATE_FORMAT = "j F Y" LANGUAGE_CODE = "en-au" @@ -544,13 +544,13 @@ CONFERENCE_NAME = os.environ.get('CONFERENCE_NAME', 'Everything Open') CONFERENCE_NAME_SHORT = os.environ.get('CONFERENCE_NAME_SHORT', 'EO') CONFERENCE_EMAIL = os.environ.get('CONFERENCE_EMAIL', DEFAULT_FROM_EMAIL) CONF_TZINFO = pytz.timezone(TIME_ZONE) -CONF_START = CONF_TZINFO.localize(datetime(2025, 1, 20)) -CONF_END = CONF_TZINFO.localize(datetime(2025, 1, 22)) -CONF_MINICONF_END = CONF_TZINFO.localize(datetime(2025, 1, 20, 23, 59)) -EARLY_BIRD_DEADLINE = CONF_TZINFO.localize(datetime(2024, 12, 1)) -PENGUIN_DINNER_TICKET_DATE = date(2025, 1, 21) -SPEAKER_DINNER_TICKET_DATE = date(2025, 1, 21) -PDNS_TICKET_DATE = date(2025, 1, 21) +CONF_START = CONF_TZINFO.localize(datetime(2026, 1, 21)) +CONF_END = CONF_TZINFO.localize(datetime(2026, 1, 23)) +CONF_MINICONF_END = CONF_TZINFO.localize(datetime(2026, 1, 21, 23, 59)) +EARLY_BIRD_DEADLINE = CONF_TZINFO.localize(datetime(2025, 9, 30)) +PENGUIN_DINNER_TICKET_DATE = date(2026, 1, 22) +SPEAKER_DINNER_TICKET_DATE = date(2026, 1, 21) +PDNS_TICKET_DATE = date(2026, 1, 21) TSHIRT_PRICE = Decimal("25.00") diff --git a/pinaxcon/templates/nav.html b/pinaxcon/templates/nav.html index 03042bdc..9a95b61d 100644 --- a/pinaxcon/templates/nav.html +++ b/pinaxcon/templates/nav.html @@ -4,7 +4,7 @@