Merge pull request #19284 from overleaf/jpa-align-pipelines

[misc] align CI pipelines

GitOrigin-RevId: e2a74cbbff15986d5ffc8f5befa3697d406b8cdd

services/clsi/buildscript.txt

@@ -2,10 +2,9 @@ clsi
 --data-dirs=cache,compiles,output
 --dependencies=
 --docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker
---env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true"
+--env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true",ALLOWED_IMAGES=quay.io/sharelatex/texlive-full:2017.1,TEXLIVE_IMAGE=quay.io/sharelatex/texlive-full:2017.1,TEX_LIVE_IMAGE_NAME_OVERRIDE=gcr.io/overleaf-ops,TEXLIVE_IMAGE_USER="tex",DOCKER_RUNNER="true",COMPILES_HOST_DIR=$PWD/compiles
---env-pass-through=TEXLIVE_IMAGE
+--env-pass-through=
 --esmock-loader=False
---has-custom-cloudbuild=True
 --node-version=18.20.2
 --public-repo=True
 --script-version=4.5.0

services/clsi/docker-compose-config.yml

@@ -1,29 +0,0 @@
-version: "2.3"
-
-services:
-  dev:
-    environment:
-      ALLOWED_IMAGES: "quay.io/sharelatex/texlive-full:2017.1"
-      TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
-      TEXLIVE_IMAGE_USER: "tex"
-      OVERLEAF_CONFIG: /overleaf/services/clsi/config/settings.defaults.js
-      DOCKER_RUNNER: "true"
-      COMPILES_HOST_DIR: $PWD/compiles
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./compiles:/overleaf/services/clsi/compiles
-      - ./cache:/overleaf/services/clsi/cache
-
-
-  ci:
-    environment:
-      ALLOWED_IMAGES: ${TEXLIVE_IMAGE}
-      TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
-      TEXLIVE_IMAGE_USER: "tex"
-      OVERLEAF_CONFIG: /overleaf/services/clsi/config/settings.defaults.js
-      DOCKER_RUNNER: "true"
-      COMPILES_HOST_DIR: $PWD/compiles
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:rw
-      - ./compiles:/overleaf/services/clsi/compiles
-      - ./cache:/overleaf/services/clsi/cache

services/clsi/docker-compose.ci.yml

@@ -16,9 +16,6 @@ services:
   test_acceptance:
     build: .
     image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
-    extends:
-      file: docker-compose-config.yml
-      service: ci
     environment:
       ELASTIC_SEARCH_DSN: es:9200
       MONGO_HOST: mongo
@@ -26,9 +23,17 @@ services:
       MOCHA_GREP: ${MOCHA_GREP}
       NODE_ENV: test
       NODE_OPTIONS: "--unhandled-rejections=strict"
-      TEXLIVE_IMAGE:
       ENABLE_PDF_CACHING: "true"
       PDF_CACHING_ENABLE_WORKER_POOL: "true"
+      ALLOWED_IMAGES: quay.io/sharelatex/texlive-full:2017.1
+      TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
+      TEX_LIVE_IMAGE_NAME_OVERRIDE: gcr.io/overleaf-ops
+      TEXLIVE_IMAGE_USER: "tex"
+      DOCKER_RUNNER: "true"
+      COMPILES_HOST_DIR: $PWD/compiles
+    volumes:
+      - ./compiles:/overleaf/services/clsi/compiles
+      - /var/run/docker.sock:/var/run/docker.sock
     command: npm run test:acceptance
 
 

services/clsi/docker-compose.yml

@@ -30,10 +30,8 @@ services:
       - .:/overleaf/services/clsi
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
+      - /var/run/docker.sock:/var/run/docker.sock
     working_dir: /overleaf/services/clsi
-    extends:
-      file: docker-compose-config.yml
-      service: dev
     environment:
       ELASTIC_SEARCH_DSN: es:9200
       MONGO_HOST: mongo
@@ -44,5 +42,11 @@ services:
       NODE_OPTIONS: "--unhandled-rejections=strict"
       ENABLE_PDF_CACHING: "true"
       PDF_CACHING_ENABLE_WORKER_POOL: "true"
+      ALLOWED_IMAGES: quay.io/sharelatex/texlive-full:2017.1
+      TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
+      TEX_LIVE_IMAGE_NAME_OVERRIDE: gcr.io/overleaf-ops
+      TEXLIVE_IMAGE_USER: "tex"
+      DOCKER_RUNNER: "true"
+      COMPILES_HOST_DIR: $PWD/compiles
     command: npm run --silent test:acceptance
 

services/docstore/docker-compose-config.yml

@@ -1,14 +0,0 @@
-version: "2.3"
-
-services:
-  dev:
-    environment:
-    - AWS_BUCKET
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY
-
-  ci:
-    environment:
-    - AWS_BUCKET
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY

services/docstore/docker-compose.ci.yml

@@ -17,9 +17,6 @@ services:
   test_acceptance:
     build: .
     image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
-    extends:
-      file: docker-compose-config.yml
-      service: ci
     environment:
       ELASTIC_SEARCH_DSN: es:9200
       MONGO_HOST: mongo

services/docstore/docker-compose.yml

@@ -26,9 +26,6 @@ services:
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
     working_dir: /overleaf/services/docstore
-    extends:
-      file: docker-compose-config.yml
-      service: dev
     environment:
       ELASTIC_SEARCH_DSN: es:9200
       MONGO_HOST: mongo