From a0ca34406569a40cbe986942f78855299b7cfee9 Mon Sep 17 00:00:00 2001 From: Gernot Schulz Date: Fri, 29 May 2026 15:53:37 +0200 Subject: [PATCH] Merge pull request #34127 from overleaf/gs-j-cd-hooks Add deploy pipeline trigger hooks to Jenkinsfiles GitOrigin-RevId: 80bb89615ae16b733009dca21a5fc41b5c30e993 --- services/chat/Makefile | 4 ++++ services/chat/buildscript.txt | 1 + services/clsi/Makefile | 4 ++++ services/docstore/Makefile | 4 ++++ services/docstore/buildscript.txt | 1 + services/document-updater/Makefile | 4 ++++ services/document-updater/buildscript.txt | 1 + services/filestore/Makefile | 4 ++++ services/filestore/buildscript.txt | 1 + services/git-bridge/Makefile | 4 ++++ services/history-v1/Makefile | 4 ++++ services/history-v1/buildscript.txt | 1 + services/notifications/Makefile | 4 ++++ services/notifications/buildscript.txt | 1 + services/project-history/Makefile | 4 ++++ services/project-history/buildscript.txt | 1 + services/real-time/Makefile | 4 ++++ services/web/Makefile | 5 +++++ 18 files changed, 52 insertions(+) diff --git a/services/chat/Makefile b/services/chat/Makefile index 28b0b3f2a9..d76f41f015 100644 --- a/services/chat/Makefile +++ b/services/chat/Makefile @@ -54,6 +54,10 @@ COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + clean: -docker rmi $(IMAGE_CI) -docker rmi $(IMAGE_REPO_FINAL) diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt index 9abab7068c..91a4288485 100644 --- a/services/chat/buildscript.txt +++ b/services/chat/buildscript.txt @@ -1,5 +1,6 @@ chat --dependencies=mongo +--deploy-pipeline=chat --env-add= --env-pass-through= --esmock-loader=False diff --git a/services/clsi/Makefile b/services/clsi/Makefile index 0535ca7da1..f8589a406d 100644 --- a/services/clsi/Makefile +++ b/services/clsi/Makefile @@ -54,6 +54,10 @@ COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + clean: -docker rmi $(IMAGE_CI) -docker rmi $(IMAGE_REPO_FINAL) diff --git a/services/docstore/Makefile b/services/docstore/Makefile index a3f0cd3f99..f217aba239 100644 --- a/services/docstore/Makefile +++ b/services/docstore/Makefile @@ -56,6 +56,10 @@ COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + clean: -docker rmi $(IMAGE_CI) -docker rmi $(IMAGE_REPO_FINAL) diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt index f8a2d4e220..a701c5b636 100644 --- a/services/docstore/buildscript.txt +++ b/services/docstore/buildscript.txt @@ -1,5 +1,6 @@ docstore --dependencies=mongo,gcs +--deploy-pipeline=docstore --env-add= --env-pass-through= --esmock-loader=False diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile index 37e62a03a6..43adbac912 100644 --- a/services/document-updater/Makefile +++ b/services/document-updater/Makefile @@ -57,6 +57,10 @@ COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + clean: -docker rmi $(IMAGE_CI) -docker rmi $(IMAGE_REPO_FINAL) diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt index f86dab5580..d7c892444d 100644 --- a/services/document-updater/buildscript.txt +++ b/services/document-updater/buildscript.txt @@ -1,5 +1,6 @@ document-updater --dependencies=mongo,redis +--deploy-pipeline=document-updater --env-add= --env-pass-through= --esmock-loader=False diff --git a/services/filestore/Makefile b/services/filestore/Makefile index e901361cd4..4a9aa1499d 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -53,6 +53,10 @@ COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + clean: -docker rmi $(IMAGE_CI) -docker rmi $(IMAGE_REPO_FINAL) diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index 4713fca521..34fffe6585 100644 --- a/services/filestore/buildscript.txt +++ b/services/filestore/buildscript.txt @@ -1,6 +1,7 @@ filestore --data-dirs=uploads,template_files --dependencies=s3,gcs +--deploy-pipeline=filestore-readonly --env-add=ENABLE_CONVERSIONS=true,USE_PROM_METRICS=true,AWS_S3_USER_FILES_STORAGE_CLASS=REDUCED_REDUNDANCY,AWS_S3_USER_FILES_BUCKET_NAME=fake-user-files,AWS_S3_USER_FILES_DEK_BUCKET_NAME=fake-user-files-dek,AWS_S3_TEMPLATE_FILES_BUCKET_NAME=fake-template-files,GCS_USER_FILES_BUCKET_NAME=fake-gcs-user-files,GCS_TEMPLATE_FILES_BUCKET_NAME=fake-gcs-template-files --env-pass-through= --esmock-loader=False diff --git a/services/git-bridge/Makefile b/services/git-bridge/Makefile index 9e8a7e4a79..c69652620e 100644 --- a/services/git-bridge/Makefile +++ b/services/git-bridge/Makefile @@ -15,6 +15,10 @@ IMAGE_REPO_BRANCH ?= $(IMAGE_REPO):$(BRANCH_NAME_TAG_SAFE) IMAGE_REPO_MAIN ?= $(IMAGE_REPO):main IMAGE_REPO_FINAL ?= $(IMAGE_REPO_BRANCH)-$(BUILD_NUMBER) +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + runtime-conf: /opt/envsubst < conf/envsubst_template.json > conf/runtime.json diff --git a/services/history-v1/Makefile b/services/history-v1/Makefile index b6c73d6ff0..de38ba75da 100644 --- a/services/history-v1/Makefile +++ b/services/history-v1/Makefile @@ -59,6 +59,10 @@ COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + clean: -docker rmi $(IMAGE_CI) -docker rmi $(IMAGE_REPO_FINAL) diff --git a/services/history-v1/buildscript.txt b/services/history-v1/buildscript.txt index a4cf157e0f..40379a2dd8 100644 --- a/services/history-v1/buildscript.txt +++ b/services/history-v1/buildscript.txt @@ -1,5 +1,6 @@ history-v1 --dependencies=postgres,gcs,mongo,redis,s3 +--deploy-pipeline=history-v1 --env-add= --env-pass-through= --esmock-loader=False diff --git a/services/notifications/Makefile b/services/notifications/Makefile index c88e7d68b2..2d56c51ed2 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -55,6 +55,10 @@ COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + clean: -docker rmi $(IMAGE_CI) -docker rmi $(IMAGE_REPO_FINAL) diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index fd6d247e91..6371afabde 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -1,5 +1,6 @@ notifications --dependencies=mongo +--deploy-pipeline=notifications --env-add= --env-pass-through= --esmock-loader=False diff --git a/services/project-history/Makefile b/services/project-history/Makefile index 6248b8858f..22d885bb06 100644 --- a/services/project-history/Makefile +++ b/services/project-history/Makefile @@ -58,6 +58,10 @@ COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + clean: -docker rmi $(IMAGE_CI) -docker rmi $(IMAGE_REPO_FINAL) diff --git a/services/project-history/buildscript.txt b/services/project-history/buildscript.txt index 593a139330..bcc89ae526 100644 --- a/services/project-history/buildscript.txt +++ b/services/project-history/buildscript.txt @@ -1,5 +1,6 @@ project-history --dependencies=mongo,redis +--deploy-pipeline=project-history --env-add= --env-pass-through= --esmock-loader=True diff --git a/services/real-time/Makefile b/services/real-time/Makefile index 3712af39ac..c9b240d39e 100644 --- a/services/real-time/Makefile +++ b/services/real-time/Makefile @@ -54,6 +54,10 @@ COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + clean: -docker rmi $(IMAGE_CI) -docker rmi $(IMAGE_REPO_FINAL) diff --git a/services/web/Makefile b/services/web/Makefile index 1e180eed5f..ebc808e2e7 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -6,6 +6,11 @@ ifeq ($(BRANCH_NAME),) export BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD) endif BRANCH_NAME_TAG_SAFE := $(shell echo "$(BRANCH_NAME)" | sed 's/\//\-\-/g' | cut -c1-96) + +.PHONY: print-branch-tag-safe +print-branch-tag-safe: + @echo $(BRANCH_NAME_TAG_SAFE) + ifeq ($(COMMIT_SHA),) export COMMIT_SHA := $(shell git rev-parse HEAD) endif