From 35dbf6968d7937d67718af9c1e98321953f8fa0a Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Wed, 4 Jun 2025 14:45:06 -0700 Subject: [PATCH 1/5] feat: updates preprod times | NPG-000 --- .../stage_data/preprod/00001_fund14_event.sql | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/event-db/stage_data/preprod/00001_fund14_event.sql b/src/event-db/stage_data/preprod/00001_fund14_event.sql index ace6b3fd84..704cf38497 100644 --- a/src/event-db/stage_data/preprod/00001_fund14_event.sql +++ b/src/event-db/stage_data/preprod/00001_fund14_event.sql @@ -29,22 +29,22 @@ INSERT INTO event ( 14, 'Fund 14', 'Catalyst Testnet - Fund 14', - '2025-05-23 12:00:00', -- Registration Snapshot Time - '2025-05-23 12:15:00', -- Snapshot Start. + '2025-06-12 10:00:00', -- Registration Snapshot Time + '2025-06-12 10:15:00', -- Snapshot Start. 25000000, -- Voting Power Threshold 100, -- Max Voting Power PCT NULL, -- Review Rewards - '2025-05-21 11:00:00', -- Start Time - '2025-06-15 21:00:00', -- End Time - '2025-05-21 11:00:00', -- Insight Sharing Start - '2025-05-21 11:00:00', -- Proposal Submission Start - '2025-05-21 11:00:00', -- Refine Proposals Start - '2025-05-21 11:00:00', -- Finalize Proposals Start - '2025-05-21 11:00:00', -- Proposal Assessment Start - '2025-05-21 11:00:00', -- Assessment QA Start - '2025-05-27 17:00:00', -- Voting Starts - '2025-06-13 09:00:00', -- Voting Ends - '2025-06-15 21:00:00', -- Tallying Ends + '2025-06-04 10:00:00', -- Start Time + '2025-06-21 02:00:00', -- End Time + '2025-06-04 10:00:00', -- Insight Sharing Start + '2025-06-04 10:00:00', -- Proposal Submission Start + '2025-06-04 10:00:00', -- Refine Proposals Start + '2025-06-04 10:00:00', -- Finalize Proposals Start + '2025-06-04 10:00:00', -- Proposal Assessment Start + '2025-06-04 10:00:00', -- Assessment QA Start + '2025-06-16 12:00:00', -- Voting Starts + '2025-06-18 09:00:00', -- Voting Ends + '2025-06-21 02:00:00', -- Tallying Ends NULL, -- Block 0 Data NULL, -- Block 0 Hash 1, -- Committee Size From d9a83269b4d2253a11e3c2e1b75098bc9a40574b Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Mon, 7 Jul 2025 15:10:02 -0700 Subject: [PATCH 2/5] chore: adds deployment for eventdb migrations --- blueprint.cue | 11 +++ containers/event-db-migrations/blueprint.cue | 92 +++++++++++++++++++- 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/blueprint.cue b/blueprint.cue index 608f5fbdee..efd41e3781 100644 --- a/blueprint.cue +++ b/blueprint.cue @@ -53,6 +53,17 @@ global: { }, ] } + deployment: { + registries: { + containers: ci.providers.aws.ecr.registry + modules: ci.providers.aws.ecr.registry + "/catalyst-deployments" + } + repo: { + url: "https://github.com/input-output-hk/catalyst-world" + ref: "master" + } + root: "k8s" + } repo: { defaultBranch: "main" name: "input-output-hk/catalyst-core" diff --git a/containers/event-db-migrations/blueprint.cue b/containers/event-db-migrations/blueprint.cue index c0c84f7200..bdfbc91008 100644 --- a/containers/event-db-migrations/blueprint.cue +++ b/containers/event-db-migrations/blueprint.cue @@ -1,11 +1,99 @@ version: "1.0.0" project: { name: "event-db-migrations" + deployment: { + on: { + always: {} + } + + bundle: modules: main: { + name: "app" + version: "0.11.0" + values: { + jobs: migration: containers: main: { + image: { + name: _ @forge(name="CONTAINER_IMAGE") + tag: _ @forge(name="GIT_HASH_OR_TAG") + } + env: { + DB_HOST: { + secret: { + name: "db" + key: "host" + } + } + DB_NAME: { + value: "eventdb" + } + DB_PORT: { + secret: { + name: "db" + key: "port" + } + } + DB_ROOT_NAME: { + value: "postgres" + } + DB_SUPERUSER: { + secret: { + name: "db-root" + key: "username" + } + } + DB_SUPERUSER_PASSWORD: { + secret: { + name: "db-root" + key: "password" + } + } + DB_USER: { + secret: { + name: "db" + key: "username" + } + } + DB_USER_PASSWORD: { + secret: { + name: "db" + key: "password" + } + } + INIT_AND_DROP_DB: { + value: string | *"true" + } + STAGE: { + value: string | *"dev" + } + } + mounts: state: { + ref: volume: name: "state" + path: "/eventdb/tmp" + readOnly: false + } + } + + secrets: { + db: { + ref: "db/eventdb" + } + root: { + ref: "db/root_account" + } + } + + volumes: state: { + size: "1Mi" + } + } + } + } + release: { docker: { on: { - merge: {} - tag: {} + //merge: {} + //tag: {} + always: {} } config: { tag: _ @forge(name="GIT_HASH_OR_TAG") From 8f53408070ab154cd6ec5c7e64b6e7d1be04e949 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Mon, 7 Jul 2025 15:12:35 -0700 Subject: [PATCH 3/5] chore: bumps forge version --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff7e5d69d5..ef1bb73e3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,6 @@ permissions: jobs: ci: - uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.1 + uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.3 with: - forge_version: 0.14.0 \ No newline at end of file + forge_version: 0.16.0 \ No newline at end of file From 4c2828b650ca90d905db6865d4441a00c37fa91c Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Mon, 7 Jul 2025 16:02:12 -0700 Subject: [PATCH 4/5] chore: fixes secret reference --- containers/event-db-migrations/blueprint.cue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/event-db-migrations/blueprint.cue b/containers/event-db-migrations/blueprint.cue index bdfbc91008..82ccc12722 100644 --- a/containers/event-db-migrations/blueprint.cue +++ b/containers/event-db-migrations/blueprint.cue @@ -36,13 +36,13 @@ project: { } DB_SUPERUSER: { secret: { - name: "db-root" + name: "root" key: "username" } } DB_SUPERUSER_PASSWORD: { secret: { - name: "db-root" + name: "root" key: "password" } } From ae736bdad8c879a7b205072102a2f7ce729a2af1 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Mon, 7 Jul 2025 16:28:26 -0700 Subject: [PATCH 5/5] chore: cleanup --- containers/event-db-migrations/blueprint.cue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/containers/event-db-migrations/blueprint.cue b/containers/event-db-migrations/blueprint.cue index 82ccc12722..586006bc39 100644 --- a/containers/event-db-migrations/blueprint.cue +++ b/containers/event-db-migrations/blueprint.cue @@ -3,7 +3,8 @@ project: { name: "event-db-migrations" deployment: { on: { - always: {} + merge: {} + tag: {} } bundle: modules: main: { @@ -91,9 +92,8 @@ project: { release: { docker: { on: { - //merge: {} - //tag: {} - always: {} + merge: {} + tag: {} } config: { tag: _ @forge(name="GIT_HASH_OR_TAG")