Integration tests: get rid from not needed containers/images

Antonytm · Feb 12, 2022 · 1df3216 · 1df3216
1 parent 65c4295
commit 1df3216
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 286 deletions.
diff --git a/integration-tests/docker-compose.override.svg.webp.avif.jxl.yml b/integration-tests/docker-compose.override.svg.webp.avif.jxl.yml
@@ -33,7 +33,9 @@ services:
     volumes:
       - ./docker/traefik:C:/etc/traefik
     depends_on:
-      hrz:
+      cm:
+        condition: service_healthy  
+      cd:
         condition: service_healthy  
 
   redis:
@@ -76,8 +78,6 @@ services:
       context: ./docker/build/id
       args:
         BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
-    environment: 
-      Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup2: https://${HRZ_HOST}
 
   cd:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cd-async-svg-webp-avif-jxl:${VERSION:-latest}
@@ -120,39 +120,4 @@ services:
       - ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
     environment:
       SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
-      Sitecore_Horizon_ClientHost: https://${HRZ_HOST}
-    entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
-  hrz:
-    image: ${SITECORE_MODULE_REGISTRY}sitecore-horizon:${HORIZON_VERSION}
-    isolation: ${ISOLATION}
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/healthz/live"]
-      timeout: 300s
-    environment:
-      Sitecore_License: ${SITECORE_LICENSE}
-      Sitecore_FederatedUI__HostBaseUrl: http://hrz
-      Sitecore_SitecorePlatform__ContentManagementUrl: https://${CM_HOST}
-      Sitecore_SitecorePlatform__ContentManagementInternalUrl: http://cm
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__RequireHttpsMetadata: 'false'
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__Authority: https://${ID_HOST}
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${HRZ_HOST}
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__InternalAuthority: http://id
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__Authority: https://${ID_HOST}
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__InternalAuthority: http://id
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__RequireHttpsMetadata: 'false'
-      Sitecore_Plugins__Filters__ExperienceAccelerator: +SXA
-    depends_on:
-      id:
-        condition: service_started
-      cm:
-        condition: service_started
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
-      - "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
-      - "traefik.http.routers.sh-secure.entrypoints=websecure"
-      - "traefik.http.routers.sh-secure.rule=Host(`${HRZ_HOST}`)"
-      - "traefik.http.routers.sh-secure.tls=true"
-      - "traefik.http.routers.sh-secure.middlewares=force-STS-Header"
-      - "traefik.http.services.sh.loadbalancer.server.port=80"
-
+    entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
diff --git a/integration-tests/docker-compose.override.svg.webp.yml b/integration-tests/docker-compose.override.svg.webp.yml
@@ -16,6 +16,8 @@ services:
       Async: "true"
       SvgOptimizationEnabled: "true"
       WebpOptimizationEnabled: "true"
+      JxlOptimizationEnabled: "false"
+      AvifOptimizationEnabled: "false"
 
     #entrypoint: powershell -Command "& C:\Tests\test.ps1"
 
@@ -31,7 +33,9 @@ services:
     volumes:
       - ./docker/traefik:C:/etc/traefik
     depends_on:
-      hrz:
+      cm:
+        condition: service_healthy  
+      cd:
         condition: service_healthy  
 
   redis:
@@ -74,8 +78,6 @@ services:
       context: ./docker/build/id
       args:
         BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
-    environment: 
-      Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup2: https://${HRZ_HOST}
 
   cd:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cd-async-svg-webp:${VERSION:-latest}
@@ -118,39 +120,4 @@ services:
       - ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
     environment:
       SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
-      Sitecore_Horizon_ClientHost: https://${HRZ_HOST}
-    entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
-  hrz:
-    image: ${SITECORE_MODULE_REGISTRY}sitecore-horizon:${HORIZON_VERSION}
-    isolation: ${ISOLATION}
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/healthz/live"]
-      timeout: 300s
-    environment:
-      Sitecore_License: ${SITECORE_LICENSE}
-      Sitecore_FederatedUI__HostBaseUrl: http://hrz
-      Sitecore_SitecorePlatform__ContentManagementUrl: https://${CM_HOST}
-      Sitecore_SitecorePlatform__ContentManagementInternalUrl: http://cm
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__RequireHttpsMetadata: 'false'
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__Authority: https://${ID_HOST}
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${HRZ_HOST}
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__InternalAuthority: http://id
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__Authority: https://${ID_HOST}
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__InternalAuthority: http://id
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__RequireHttpsMetadata: 'false'
-      Sitecore_Plugins__Filters__ExperienceAccelerator: +SXA
-    depends_on:
-      id:
-        condition: service_started
-      cm:
-        condition: service_started
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
-      - "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
-      - "traefik.http.routers.sh-secure.entrypoints=websecure"
-      - "traefik.http.routers.sh-secure.rule=Host(`${HRZ_HOST}`)"
-      - "traefik.http.routers.sh-secure.tls=true"
-      - "traefik.http.routers.sh-secure.middlewares=force-STS-Header"
-      - "traefik.http.services.sh.loadbalancer.server.port=80"
-
+    entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
diff --git a/integration-tests/docker-compose.override.svg.yml b/integration-tests/docker-compose.override.svg.yml
@@ -15,6 +15,9 @@ services:
       TestConfigurationName: default-svg
       Async: "true"
       SvgOptimizationEnabled: "true"
+      WebpOptimizationEnabled: "false"
+      JxlOptimizationEnabled: "false"
+      AvifOptimizationEnabled: "false"
 
     #entrypoint: powershell -Command "& C:\Tests\test.ps1"
 
@@ -30,8 +33,11 @@ services:
     volumes:
       - ./docker/traefik:C:/etc/traefik
     depends_on:
-      hrz:
+      cm:
+        condition: service_healthy  
+      cd:
         condition: service_healthy  
+
 
   redis:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-redis:${VERSION:-latest}
@@ -73,8 +79,6 @@ services:
       context: ./docker/build/id
       args:
         BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
-    environment: 
-      Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup2: https://${HRZ_HOST}
 
   cd:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cd-async-svg:${VERSION:-latest}
@@ -117,39 +121,5 @@ services:
       - ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
     environment:
       SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
-      Sitecore_Horizon_ClientHost: https://${HRZ_HOST}
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
-  hrz:
-    image: ${SITECORE_MODULE_REGISTRY}sitecore-horizon:${HORIZON_VERSION}
-    isolation: ${ISOLATION}
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/healthz/live"]
-      timeout: 300s
-    environment:
-      Sitecore_License: ${SITECORE_LICENSE}
-      Sitecore_FederatedUI__HostBaseUrl: http://hrz
-      Sitecore_SitecorePlatform__ContentManagementUrl: https://${CM_HOST}
-      Sitecore_SitecorePlatform__ContentManagementInternalUrl: http://cm
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__RequireHttpsMetadata: 'false'
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__Authority: https://${ID_HOST}
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${HRZ_HOST}
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__InternalAuthority: http://id
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__Authority: https://${ID_HOST}
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__InternalAuthority: http://id
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__RequireHttpsMetadata: 'false'
-      Sitecore_Plugins__Filters__ExperienceAccelerator: +SXA
-    depends_on:
-      id:
-        condition: service_started
-      cm:
-        condition: service_started
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
-      - "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
-      - "traefik.http.routers.sh-secure.entrypoints=websecure"
-      - "traefik.http.routers.sh-secure.rule=Host(`${HRZ_HOST}`)"
-      - "traefik.http.routers.sh-secure.tls=true"
-      - "traefik.http.routers.sh-secure.middlewares=force-STS-Header"
-      - "traefik.http.services.sh.loadbalancer.server.port=80"
 
diff --git a/integration-tests/docker-compose.override.sync.yml b/integration-tests/docker-compose.override.sync.yml
@@ -14,6 +14,10 @@ services:
       CDHostname: http://cd
       TestConfigurationName: default-sync
       Async: "false"
+      SvgOptimizationEnabled: "false"
+      WebpOptimizationEnabled: "false"
+      JxlOptimizationEnabled: "false"
+      AvifOptimizationEnabled: "false"
     #entrypoint: powershell -Command "& C:\Tests\test.ps1"
 
   dianoga:
@@ -28,7 +32,9 @@ services:
     volumes:
       - ./docker/traefik:C:/etc/traefik
     depends_on:
-      hrz:
+      cm:
+        condition: service_healthy  
+      cd:
         condition: service_healthy  
 
   redis:
@@ -71,8 +77,6 @@ services:
       context: ./docker/build/id
       args:
         BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
-    environment: 
-      Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup2: https://${HRZ_HOST}
 
   cd:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cd-sync:${VERSION:-latest}
@@ -115,39 +119,5 @@ services:
       - ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
     environment:
       SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
-      Sitecore_Horizon_ClientHost: https://${HRZ_HOST}
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
-  hrz:
-    image: ${SITECORE_MODULE_REGISTRY}sitecore-horizon:${HORIZON_VERSION}
-    isolation: ${ISOLATION}
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/healthz/live"]
-      timeout: 300s
-    environment:
-      Sitecore_License: ${SITECORE_LICENSE}
-      Sitecore_FederatedUI__HostBaseUrl: http://hrz
-      Sitecore_SitecorePlatform__ContentManagementUrl: https://${CM_HOST}
-      Sitecore_SitecorePlatform__ContentManagementInternalUrl: http://cm
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__RequireHttpsMetadata: 'false'
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__Authority: https://${ID_HOST}
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${HRZ_HOST}
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__InternalAuthority: http://id
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__Authority: https://${ID_HOST}
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__InternalAuthority: http://id
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__RequireHttpsMetadata: 'false'
-      Sitecore_Plugins__Filters__ExperienceAccelerator: +SXA
-    depends_on:
-      id:
-        condition: service_started
-      cm:
-        condition: service_started
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
-      - "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
-      - "traefik.http.routers.sh-secure.entrypoints=websecure"
-      - "traefik.http.routers.sh-secure.rule=Host(`${HRZ_HOST}`)"
-      - "traefik.http.routers.sh-secure.tls=true"
-      - "traefik.http.routers.sh-secure.middlewares=force-STS-Header"
-      - "traefik.http.services.sh.loadbalancer.server.port=80"
 
diff --git a/integration-tests/docker-compose.override.yml b/integration-tests/docker-compose.override.yml
@@ -14,6 +14,10 @@ services:
       CDHostname: http://cd
       TestConfigurationName: default
       Async: "true"
+      SvgOptimizationEnabled: "false"
+      WebpOptimizationEnabled: "false"
+      JxlOptimizationEnabled: "false"
+      AvifOptimizationEnabled: "false"
     #entrypoint: powershell -Command "& C:\Tests\test.ps1"
 
   dianoga:
@@ -28,7 +32,9 @@ services:
     volumes:
       - ./docker/traefik:C:/etc/traefik
     depends_on:
-      hrz:
+      cd:
+        condition: service_healthy  
+      cm:
         condition: service_healthy  
 
   redis:
@@ -71,8 +77,6 @@ services:
       context: ./docker/build/id
       args:
         BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
-    environment: 
-      Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup2: https://${HRZ_HOST}
 
   cd:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cd-async:${VERSION:-latest}
@@ -115,39 +119,5 @@ services:
       - ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
     environment:
       SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
-      Sitecore_Horizon_ClientHost: https://${HRZ_HOST}
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
-  hrz:
-    image: ${SITECORE_MODULE_REGISTRY}sitecore-horizon:${HORIZON_VERSION}
-    isolation: ${ISOLATION}
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/healthz/live"]
-      timeout: 300s
-    environment:
-      Sitecore_License: ${SITECORE_LICENSE}
-      Sitecore_FederatedUI__HostBaseUrl: http://hrz
-      Sitecore_SitecorePlatform__ContentManagementUrl: https://${CM_HOST}
-      Sitecore_SitecorePlatform__ContentManagementInternalUrl: http://cm
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__RequireHttpsMetadata: 'false'
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__Authority: https://${ID_HOST}
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${HRZ_HOST}
-      Sitecore_Sitecore__Authentication__OpenIdConnectOptions__InternalAuthority: http://id
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__Authority: https://${ID_HOST}
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__InternalAuthority: http://id
-      Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__RequireHttpsMetadata: 'false'
-      Sitecore_Plugins__Filters__ExperienceAccelerator: +SXA
-    depends_on:
-      id:
-        condition: service_started
-      cm:
-        condition: service_started
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
-      - "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
-      - "traefik.http.routers.sh-secure.entrypoints=websecure"
-      - "traefik.http.routers.sh-secure.rule=Host(`${HRZ_HOST}`)"
-      - "traefik.http.routers.sh-secure.tls=true"
-      - "traefik.http.routers.sh-secure.middlewares=force-STS-Header"
-      - "traefik.http.services.sh.loadbalancer.server.port=80"
 
diff --git a/integration-tests/docker/build/cm/Dockerfile b/integration-tests/docker/build/cm/Dockerfile
@@ -4,13 +4,11 @@ ARG BASE_IMAGE
 ARG SXA_IMAGE
 ARG SPE_IMAGE
 ARG TOOLING_IMAGE
-ARG HORIZON_RESOURCES_IMAGE
 ARG DIANOGA_IMAGE
 
 FROM ${TOOLING_IMAGE} as tooling
 FROM ${SPE_IMAGE} as spe
 FROM ${SXA_IMAGE} as sxa
-FROM ${HORIZON_RESOURCES_IMAGE} as horizon_resources
 FROM ${DIANOGA_IMAGE} as dianoga
 FROM ${BASE_IMAGE}
 
@@ -39,8 +37,5 @@ COPY --from=sxa \module\tools \module\tools
 RUN C:\module\tools\Initialize-Content.ps1 -TargetPath .\; `
     Remove-Item -Path C:\module -Recurse -Force;
 
-# Add horizon module
-COPY --from=horizon_resources \module\cm\content \inetpub\wwwroot
-
 # Disable Media Request Protection for simplicity of testing (no need to worry about hash get parameter)
 RUN Powershell Rename-Item -Path "C:\inetpub\wwwroot\App_Config\Sitecore\CMS.Core\Sitecore.Media.RequestProtection.config" -NewName "Sitecore.Media.RequestProtection.config.disabled"
diff --git a/integration-tests/docker/build/cortexprocessing/Dockerfile b/integration-tests/docker/build/cortexprocessing/Dockerfile
diff --git a/integration-tests/docker/build/cortexprocessingworker/Dockerfile b/integration-tests/docker/build/cortexprocessingworker/Dockerfile