diff --git a/scripts/g14-gitops-render.mjs b/scripts/g14-gitops-render.mjs index 6075eec7..bce8a907 100644 --- a/scripts/g14-gitops-render.mjs +++ b/scripts/g14-gitops-render.mjs @@ -1131,8 +1131,8 @@ function prepareSourceScript() { "catalog_path=\"$(params.catalog-path)\"", "mkdir -p \"$(dirname \"$catalog_path\")\"", "catalog_fetch_started_ms=\"$(ci_now_ms)\"", - "if git_timed catalog-ls-remote 45 git ls-remote --exit-code --heads \"$(params.git-url)\" \"$(params.gitops-branch)\" >/dev/null; then", - " git remote set-url gitops-catalog \"$(params.git-url)\" 2>/dev/null || git remote add gitops-catalog \"$(params.git-url)\"", + "if git_timed catalog-ls-remote 45 git ls-remote --exit-code --heads \"$git_read_url\" \"$(params.gitops-branch)\" >/dev/null; then", + " git remote set-url gitops-catalog \"$git_read_url\" 2>/dev/null || git remote add gitops-catalog \"$git_read_url\"", " git_timed catalog-fetch 90 git fetch --depth 1 gitops-catalog \"$(params.gitops-branch)\" >/dev/null || true", " if git cat-file -e FETCH_HEAD:\"$catalog_path\" 2>/dev/null; then", " git show FETCH_HEAD:\"$catalog_path\" > /tmp/hwlab-gitops-artifact-catalog.json", diff --git a/scripts/g14-gitops-render.test.ts b/scripts/g14-gitops-render.test.ts index 33961a03..d32d2b34 100644 --- a/scripts/g14-gitops-render.test.ts +++ b/scripts/g14-gitops-render.test.ts @@ -69,7 +69,8 @@ test("v02 render follows TypeScript runtime checks and does not self-patch boots const prepareSourceScript = prepareSource.taskSpec.steps[0].script; assert.match(prepareSourceScript, /git_read_url="\$\(params\.git-read-url\)"/u); assert.match(prepareSourceScript, /git_timed source-clone 180 git clone --branch "\$\(params\.source-branch\)" "\$git_read_url"/u); - assert.match(prepareSourceScript, /git_timed catalog-ls-remote 45 git ls-remote --exit-code --heads "\$\(params\.git-url\)"/u); + assert.match(prepareSourceScript, /git_timed catalog-ls-remote 45 git ls-remote --exit-code --heads "\$git_read_url"/u); + assert.match(prepareSourceScript, /git remote set-url gitops-catalog "\$git_read_url"/u); const pipelineGitReadParam = pipelineJson.spec.params.find((param) => param.name === "git-read-url"); assert.equal(pipelineGitReadParam?.default, "http://git-mirror-http.devops-infra.svc.cluster.local/pikasTech/HWLAB.git");