From a43eaced800d93f17912b7d435601a3d0b170767 Mon Sep 17 00:00:00 2001 From: Joel Addison Date: Mon, 19 Aug 2024 20:16:56 +1000 Subject: [PATCH] Everything Open 2025 --- .gitlab-ci.yml | 28 +++++++++++------------ fixtures/conference.json | 8 +++---- fixtures/sessions/conference.section.json | 4 ++-- fixtures/sites.json | 4 ++-- k8s/deployment_template.jsonnet | 2 +- pinaxcon/settings.py | 16 ++++++------- pinaxcon/templates/nav.html | 2 +- pinaxcon/templates/site_base.html | 16 ++++++------- static/src/img/eo2024.svg | 1 - static/src/img/eo2025.svg | 1 + vendor/registrasion/registrasion/views.py | 2 +- vendor/symposion/schedule/views.py | 2 +- 12 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 static/src/img/eo2024.svg create mode 100644 static/src/img/eo2025.svg diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4c4f811..37145d0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: DOCKER_TLS_CERTDIR: "/certs" - CONTAINER_PREFIX: 2024 + CONTAINER_PREFIX: 2025 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/2024 - - conf/2024 + - dev/2025 + - conf/2025 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=eo2024-staging --user=gitlab-ci + - kubectl config set-context cluster --cluster=cluster --namespace=eo2025-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/2024 + - dev/2025 environment: - name: 2024/staging - url: https://eo2024-staging.osaconftools.net/ + name: 2025/staging + url: https://eo2025-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=eo2024-prod --user=gitlab-ci + - kubectl config set-context cluster --cluster=cluster --namespace=eo2025-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/2024 + - conf/2025 environment: - name: 2024/prod - url: https://2024.everythingopen.au/ + name: 2025/prod + url: https://2025.everythingopen.au/ .docs_template: &sphinx image: alpine @@ -71,7 +71,7 @@ pages: stage: build only: - master - - conf/2024 + - conf/2025 environment: name: docs url: https://laconfdev.gitlab.io/symposion_app/ @@ -81,5 +81,5 @@ build-sphinx: stage: build except: - master - - conf/2024 - - dev/2024 + - conf/2025 + - dev/2025 diff --git a/fixtures/conference.json b/fixtures/conference.json index 822511a7..a8fd6a85 100644 --- a/fixtures/conference.json +++ b/fixtures/conference.json @@ -3,10 +3,10 @@ "model": "symposion_conference.conference", "pk": 1, "fields": { - "title": "Everything Open 2024", - "start_date": "2024-04-16", - "end_date": "2024-04-18", - "timezone": "Australia/Brisbane" + "title": "Everything Open 2025", + "start_date": "2025-01-20", + "end_date": "2025-01-22", + "timezone": "Australia/Adelaide" } } ] diff --git a/fixtures/sessions/conference.section.json b/fixtures/sessions/conference.section.json index 72cbae58..9e8da9e3 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": "2024-04-16", - "end_date": "2024-04-18" + "start_date": "2025-01-20", + "end_date": "2025-01-22" } } ] diff --git a/fixtures/sites.json b/fixtures/sites.json index 4b17c093..cf76c1c8 100644 --- a/fixtures/sites.json +++ b/fixtures/sites.json @@ -3,8 +3,8 @@ "model": "sites.site", "pk": 1, "fields": { - "domain": "2024.everythingopen.au", - "name": "Everything Open 2024" + "domain": "2025.everythingopen.au", + "name": "Everything Open 2025" } } ] diff --git a/k8s/deployment_template.jsonnet b/k8s/deployment_template.jsonnet index 70bd9f48..835294ab 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/2024:" + sha, + "image": "registry.gitlab.com/laconfdev/symposion_app/2025:" + sha, "imagePullPolicy": "Always", "livenessProbe": { "failureThreshold": 3, diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 1947acf5..5930a8cf 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -125,7 +125,7 @@ else: ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*'] -TIME_ZONE = "Australia/Brisbane" +TIME_ZONE = "Australia/Adelaide" DATE_FORMAT = "j F Y" LANGUAGE_CODE = "en-au" @@ -518,13 +518,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(2024, 4, 16)) -CONF_END = CONF_TZINFO.localize(datetime(2024, 4, 18)) -CONF_MINICONF_END = CONF_TZINFO.localize(datetime(2024, 4, 16, 23, 59)) -EARLY_BIRD_DEADLINE = CONF_TZINFO.localize(datetime(2024, 1, 28)) -PENGUIN_DINNER_TICKET_DATE = date(2024, 4, 17) -SPEAKER_DINNER_TICKET_DATE = date(2024, 4, 16) -PDNS_TICKET_DATE = date(2024, 4, 16) +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) TSHIRT_PRICE = Decimal("25.00") diff --git a/pinaxcon/templates/nav.html b/pinaxcon/templates/nav.html index f1a0fed9..03042bdc 100644 --- a/pinaxcon/templates/nav.html +++ b/pinaxcon/templates/nav.html @@ -4,7 +4,7 @@