feat(ci): Add e2e tests against latest docker images

server/docker-compose.yml

@@ -1,18 +1,34 @@
 services:
+  proxy:
+    platform: linux/amd64/v3
+    image: nginx:latest
+    depends_on:
+      - "alfred"
+      - "historian"
+      - "nexus"
+    volumes:
+      - ./routerlicious/nginx.conf:/etc/nginx/nginx.conf
+    ports:
+      - "3003:3003"
+      - "3002:3002"
+      - "3001:3001"
   alfred:
     image: ${REGISTRY_URL:-mcr.microsoft.com}/fluidframework/routerlicious/server:${ALFRED_IMAGE_TAG:-latest}
-    ports:
-      - "3003:3000"
+    expose:
+      - "3000"
     command: node packages/routerlicious/dist/alfred/www.js
     environment:
       - DEBUG=fluid:*
       - NODE_ENV=development
       - IS_FLUID_SERVER=true
     restart: always
+    # THIS VOLUMES IS FOR LOCAL TESTING, IT SHOULD NOT GET MERGED
+    volumes:
+      - ./routerlicious/packages/routerlicious/config/config.json:/usr/src/server/packages/routerlicious/config/config.json
   nexus:
     image: ${REGISTRY_URL:-mcr.microsoft.com}/fluidframework/routerlicious/server:${ALFRED_IMAGE_TAG:-latest}
-    ports:
-      - "3002:3000"
+    expose:
+      - "3000"
     command: node packages/routerlicious/dist/nexus/www.js
     environment:
       - DEBUG=fluid:*
@@ -63,15 +79,17 @@ services:
     restart: always
   historian:
     image: ${REGISTRY_URL:-mcr.microsoft.com}/fluidframework/routerlicious/historian:${HISTORIAN_IMAGE_TAG:-latest}
-    ports:
-      - "3001:3000"
+    expose:
+      - "3000"
     environment:
       - DEBUG=fluid:*
       - NODE_ENV=development
       - IS_FLUID_SERVER=true
+    # volumes:
+    #   - ./routerlicious/packages/routerlicious/config/config.json:/home/node/server/packages/routerlicious/config.json
     restart: always
   gitrest:
-    image: ${REGISTRY_URL:-mcr.microsoft.com}/fluidframework/routerlicious/gitrest:${HISTORIAN_IMAGE_TAG:-latest}
+    image: ${REGISTRY_URL:-mcr.microsoft.com}/fluidframework/routerlicious/gitrest:${GITREST_IMAGE_TAG:-latest}
     environment:
       - DEBUG=fluid:*
       - NODE_ENV=development
@@ -80,7 +98,7 @@ services:
       - git:/home/node/documents
     restart: always
   git:
-    image: ${REGISTRY_URL:-mcr.microsoft.com}/fluidframework/routerlicious/gitssh:${HISTORIAN_IMAGE_TAG:-latest}
+    image: ${REGISTRY_URL:-mcr.microsoft.com}/fluidframework/routerlicious/gitssh:${GITSSH_IMAGE_TAG:-latest}
     ports:
       - "3022:22"
     volumes:

server/routerlicious/docker-compose.yml

@@ -1,5 +1,6 @@
 services:
   proxy:
+    platform: linux/amd64/v3
     image: nginx:latest
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf
@@ -105,7 +106,7 @@ services:
       - IS_FLUID_SERVER=true
     restart: always
   historian:
-    image: mcr.microsoft.com/fluidframework/routerlicious/historian:latest
+    image: ${REGISTRY_URL:-mcr.microsoft.com}/fluidframework/routerlicious/historian:${HISTORIAN_IMAGE_TAG:-latest}
     expose:
       - "3000"
     environment:
@@ -114,7 +115,7 @@ services:
       - IS_FLUID_SERVER=true
     restart: always
   gitrest:
-    image: mcr.microsoft.com/fluidframework/routerlicious/gitrest:latest
+    image: ${REGISTRY_URL:-mcr.microsoft.com}/fluidframework/routerlicious/gitrest:${GITREST_IMAGE_TAG:-latest}
     environment:
       - DEBUG=fluid:*
       - NODE_ENV=development
@@ -123,7 +124,7 @@ services:
       - git:/home/node/documents
     restart: always
   git:
-    image: mcr.microsoft.com/fluidframework/routerlicious/gitssh:latest
+    image: ${REGISTRY_URL:-mcr.microsoft.com}/fluidframework/routerlicious/gitssh:${GITSSH_IMAGE_TAG:-latest}
     ports:
       - "3022:22"
     volumes:

server/routerlicious/packages/routerlicious/config/config.json

@@ -66,7 +66,7 @@
 		"endpoint": "zookeeper:2181"
 	},
 	"storage": {
-		"enableWholeSummaryUpload": false,
+		"enableWholeSummaryUpload": true,
 		"ephemeralDocumentTTLSec": 86400,
 		"storageUrl": "http://gitrest:3000"
 	},

tools/pipelines/templates/include-test-real-service.yml

@@ -105,6 +105,14 @@ parameters:
   type: boolean
   default: false
 
+- name: preSteps
+  type: stepList
+  default: []
+
+- name: checkout
+  type: boolean
+  default: false
+
 stages:
 - stage: ${{ parameters.stageId}}
   displayName: ${{ parameters.stageDisplayName }}
@@ -154,8 +162,12 @@ stages:
 
         steps:
         # Setup
-        - checkout: none
-          clean: true
+        - ${{ if eq(parameters.checkout, true) }}:
+          - checkout: self
+            clean: true
+        - ${{ else }}:
+          - checkout: none
+            clean: true
 
         # Install self-signed cert for R11s deployment in local cert store
         - ${{ if ne(parameters.r11sSelfSignedCertSecureFile, '') }}:
@@ -209,6 +221,8 @@ stages:
 
         - template: include-use-node-version.yml
 
+        - ${{ parameters.preSteps }}
+
         # Download artifact
         - task: DownloadPipelineArtifact@2
           displayName: Download test package

tools/pipelines/test-real-service.yml

@@ -10,7 +10,7 @@ pr: none
 
 resources:
   pipelines:
-  - pipeline: client   # Name of the pipeline resource
+  - pipeline: client
     source: Build - client packages
     branch: main # Default branch for manual/scheduled triggers if none is selected
     trigger:
@@ -19,6 +19,18 @@ resources:
       - main
       - next
       - lts
+  - pipeline: routerlicious
+    source: server-routerlicious
+    branch: main # Default branch for manual/scheduled triggers if none is selected
+  - pipeline: historian
+    source: server-historian
+    branch: main # Default branch for manual/scheduled triggers if none is selected
+  - pipeline: gitrest
+    source: server-gitrest
+    branch: main # Default branch for manual/scheduled triggers if none is selected
+  - pipeline: gitssh
+    source: server-gitssh
+    branch: main # Default branch for manual/scheduled triggers if none is selected
 
 variables:
 - group: prague-key-vault
@@ -103,6 +115,68 @@ stages:
         fluid__test__driver__r11s: $(automation-fluid-test-driver-r11s)
         FLUID_TEST_LOGGER_PKG_PATH: ${{ variables.testWorkspace }}/node_modules/@ff-internal/aria-logger # Contains getTestLogger impl to inject
 
+  # end-to-end tests docker
+  - template: templates/include-test-real-service.yml
+    parameters:
+      stageId: e2e_docker
+      stageDisplayName: e2e - docker
+      poolBuild: Large
+      testPackage: ${{ variables.testPackage }}
+      testWorkspace: ${{ variables.testWorkspace }}
+      artifactBuildId: $(resources.pipeline.client.runID)
+      continueOnError: true
+      testCommand: test:realsvc:r11s:docker
+      checkout: true
+      stageVariables:
+        - group: container-registry-info
+      splitTestVariants:
+        - name: Non-compat
+          flags: --compatVersion=0
+        - name: N-1
+          flags: --compatVersion=-1
+        - name: LTS
+          flags: --compatVersion=LTS
+        - name: Cross-Version
+          flags: --compatVersion=CROSS_VERSION
+      cacheCompatVersionsInstalls: true
+      uploadTestPassRateTelemetry: true
+      pipelineIdentifierForTelemetry: ${{ variables.pipelineIdentifierForTelemetry }}
+      preSteps:
+        - task: Docker@2
+          displayName: 'Login to container registry'
+          inputs:
+            # $(containerRegistryConnection) comes from the container-registry-info variable group and needs to be
+            # specified as a runtime variable (variables from variable groups apparently are never available "statically"
+            # at parse/compile time, so can't be used with template-expression syntax ( '${{ }}' )).
+            containerRegistry: 'Fluid Container Registry' # $(containerRegistryConnection)
+            command: 'login'
+        - task: DockerCompose@1
+          displayName: 'Start routerlicious environment in docker'
+          inputs:
+            containerregistrytype: 'Container Registry'
+            dockerComposeFile: 'server/docker-compose.yml'
+            action: 'Run a Docker Compose command'
+            dockerComposeCommand: 'up -d'
+            projectName: 'routerlicious'
+          env:
+            REGISTRY_URL: fluidcr.azurecr.io/build
+            ALFRED_IMAGE_TAG: 0.0.$(resources.pipeline.routerlicious.runID)
+            HISTORIAN_IMAGE_TAG: 0.0.$(resources.pipeline.historian.runID)
+            GITREST_IMAGE_TAG: 0.0.$(resources.pipeline.gitrest.runID)
+            GITSSH_IMAGE_TAG: 0.0.$(resources.pipeline.gitssh.runID)
+      additionalSteps:
+        - task: DockerCompose@1
+          displayName: 'Stop routerlicious environment in docker'
+          condition: always()
+          inputs:
+            containerregistrytype: 'Container Registry'
+            dockerComposeFile: 'server/docker-compose.yml'
+            action: 'Run a Docker Compose command'
+            dockerComposeCommand: 'down'
+            projectName: 'routerlicious'
+      env:
+        FLUID_TEST_LOGGER_PKG_PATH: ${{ variables.testWorkspace }}/node_modules/@ff-internal/aria-logger # Contains getTestLogger impl to inject
+
   # end-to-end tests frs
   - template: templates/include-test-real-service.yml
     parameters: