From d51c9d74857aca3c2f172609297266968bc7f809 Mon Sep 17 00:00:00 2001 From: Elizabeth Alexander Hunt Date: Mon, 12 May 2025 09:40:12 -0700 Subject: The big refactor TM --- .ci/ci.ts | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to '.ci') diff --git a/.ci/ci.ts b/.ci/ci.ts index b79a830..985b9ee 100644 --- a/.ci/ci.ts +++ b/.ci/ci.ts @@ -1,14 +1,16 @@ #!/usr/bin/env -S deno run --allow-env import { + AnsiblePlaybookJob, BuildDockerImageJob, DefaultGitHookPipelineBuilder, -} from "@liz-ci/model"; -import { AnsiblePlaybookJob, FetchCodeJob } from "../model/job.ts"; + FetchCodeJob, +} from "@emprespresso/ci-model"; const REGISTRY = "oci.liz.coffee"; -const NAMESPACE = "img"; -const IMG = "liz-ci"; +const NAMESPACE = "@emprespresso"; +const IMG = "ci"; +const REMOTE = "ssh://src.liz.coffee:2222"; const getPipeline = () => { const gitHookPipeline = new DefaultGitHookPipelineBuilder(); @@ -21,18 +23,18 @@ const getPipeline = () => { imageTag: branch, }; - const ciPackageBuild: BuildDockerImageJob = { + const baseCiPackageBuild: BuildDockerImageJob = { type: "build_docker_image", arguments: { ...commonBuildArgs, context: gitHookPipeline.getSourceDestination(), - repository: IMG, - buildTarget: IMG, + repository: IMG + "-base", + buildTarget: IMG + "-base", dockerfile: "Dockerfile", }, }; gitHookPipeline.addStage({ - parallelJobs: [ciPackageBuild], + parallelJobs: [baseCiPackageBuild], }); const subPackages = [ @@ -59,7 +61,7 @@ const getPipeline = () => { const fetchAnsibleCode: FetchCodeJob = { type: "fetch_code", arguments: { - remoteUrl: "ssh://src.liz.coffee:2222/infra", + remoteUrl: `${REMOTE}/infra`, checkout: "main", path: "infra", }, @@ -79,5 +81,7 @@ const getPipeline = () => { }; if (import.meta.main) { - console.log(getPipeline().serialize()); + const encoder = new TextEncoder(); + const data = encoder.encode(getPipeline().serialize()); + await Deno.stdout.write(data); } -- cgit v1.2.3-70-g09d2