Create the integration-tests/config-sync initial project

.gitignore

@@ -37,4 +37,3 @@ docker-compose_datadir*
 /.metadata/
 
 .vscode
-datadir

Makefile

@@ -1,7 +1,7 @@
 all: deps install test docker
 
-# run `make build-image[-*] PUSH=true` to push the images to dockerhub
-PUSH?="false"
+# run `make build-image[-*] SKIP_PUSH=true` to push the images to dockerhub
+SKIP_PUSH?="true"
 
 check:
 	./mvnw -f src/ -P-geoserver fmt:check -DskipTests -ntp -T4
@@ -21,19 +21,19 @@ build-image-openj9: build-image-infrastructure-openj9 build-image-geoserver-open
 
 build-image-infrastructure:
 	./mvnw clean package -f src/apps/infrastructure \
-	-Ddocker -P-geoserver -Ddockerfile.push.skip=$(PUSH) -ntp -Dfmt.skip -DskipTests
+	-Ddocker -P-geoserver -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests
 
 build-image-infrastructure-openj9:
 	./mvnw clean package -f src/apps/infrastructure \
-	-Dopenj9 -P-geoserver -Ddockerfile.push.skip=$(PUSH) -ntp -Dfmt.skip -DskipTests
+	-Dopenj9 -P-geoserver -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests
 
 build-image-geoserver:
 	./mvnw clean package -f src/apps/geoserver \
-	-Ddocker -P-geoserver -Ddockerfile.push.skip=$(PUSH) -ntp -Dfmt.skip -DskipTests
+	-Ddocker -P-geoserver -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests
 
 build-image-geoserver-openj9:
 	./mvnw clean package -f src/apps/geoserver \
-	-Dopenj9 -P-geoserver -Ddockerfile.push.skip=$(PUSH) -ntp -Dfmt.skip -DskipTests
+	-Dopenj9 -P-geoserver -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests
 
 build-config-native-image:
 	./mvnw -pl :gs-cloud-config-service package -am -Dfmt.action=check -ntp -P-geoserver

src/apps/geoserver/gwc/pom.xml

@@ -15,10 +15,6 @@
     <start-class>org.geoserver.cloud.gwc.app.GeoWebCacheApplication</start-class>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>org.geoserver.cloud</groupId>
-      <artifactId>gs-cloud-spring-boot-starter</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.geoserver.cloud</groupId>
       <artifactId>gs-cloud-starter-webmvc</artifactId>

src/apps/geoserver/pom.xml

@@ -21,18 +21,10 @@
     <!-- <module>catalog</module>-->
   </modules>
   <dependencies>
-    <dependency>
-      <groupId>org.geoserver.cloud</groupId>
-      <artifactId>gs-cloud-starter-event-bus</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-bootstrap</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.retry</groupId>
-      <artifactId>spring-retry</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-aop</artifactId>

src/catalog/event-bus/pom.xml

@@ -9,9 +9,6 @@
   <artifactId>gs-cloud-catalog-event-bus</artifactId>
   <packaging>jar</packaging>
   <description>Event bus catalog notification support</description>
-  <properties>
-    <testcontainers.version>1.15.1</testcontainers.version>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
@@ -59,13 +56,11 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>rabbitmq</artifactId>
-      <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/catalog/event-bus/src/test/resources/application.yml

@@ -4,10 +4,6 @@ spring:
     allow-bean-definition-overriding: true
     allow-circular-references: true # false by default since spring-boot 2.6.0, breaks geoserver initialization
   cloud.bus.enabled: true
-geoserver:
-  bus:
-    send-object: false
-    send-diff: false
 
 logging:
   level:

src/integration-tests/catalog-service-it/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.geoserver.cloud</groupId>
+    <groupId>org.geoserver.cloud.it</groupId>
     <artifactId>integration-tests</artifactId>
     <version>${revision}</version>
   </parent>

src/integration-tests/config-sync/config

@@ -0,0 +1 @@
+../../../config

src/integration-tests/config-sync/docker-compose-it.yml

@@ -0,0 +1,79 @@
+version: "3.8"
+
+services:
+  rabbitmq:
+    image: rabbitmq:3.9-management
+    user: ${GS_USER}
+    deploy:
+      resources:
+        limits:
+          cpus: '2.0'
+          memory: 1G
+
+  gateway:
+    image: geoservercloud/geoserver-cloud-gateway:1.0-SNAPSHOT
+    user: ${GS_USER}
+    environment:
+      SPRING_PROFILES_ACTIVE: standalone
+      RETRY_MAX_ATTEMPTS: 100
+      # eat our own dogfood and set a base path
+      GEOSERVER_BASE_PATH: /geoserver/cloud
+    volumes:
+      - ./config:/etc/gscloud
+    ports:
+      - 7777:8080
+    deploy:
+      resources:
+        limits:
+          cpus: '4.0'
+          memory: 1G
+  wfs:
+    image: geoservercloud/geoserver-cloud-wfs:1.0-SNAPSHOT
+    user: ${GS_USER}
+    depends_on:
+      - rabbitmq
+    environment:
+      SPRING_PROFILES_ACTIVE: standalone,datadir
+      RETRY_MAX_ATTEMPTS: 100
+    volumes:
+      - ./config:/etc/gscloud
+      - ${TMP_DATADIR}:/opt/app/data_directory
+    deploy:
+      resources:
+        limits:
+          cpus: '2.0'
+          memory: 1G
+
+  wms:
+    image: geoservercloud/geoserver-cloud-wms:1.0-SNAPSHOT
+    user: ${GS_USER}
+    depends_on:
+      - rabbitmq
+    environment:
+      SPRING_PROFILES_ACTIVE: standalone,datadir
+      RETRY_MAX_ATTEMPTS: 100
+    volumes:
+      - ./config:/etc/gscloud
+      - ${TMP_DATADIR}:/opt/app/data_directory
+    deploy:
+      resources:
+        limits:
+          cpus: '2.0'
+          memory: 1G
+
+  webui:
+    image: geoservercloud/geoserver-cloud-webui:1.0-SNAPSHOT
+    user: ${GS_USER}
+    depends_on:
+      - rabbitmq
+    environment:
+      SPRING_PROFILES_ACTIVE: standalone,datadir
+      RETRY_MAX_ATTEMPTS: 100
+    volumes:
+      - ./config:/etc/gscloud
+      - ${TMP_DATADIR}:/opt/app/data_directory
+    deploy:
+      resources:
+        limits:
+          cpus: '2.0'
+          memory: 1G

src/integration-tests/config-sync/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.geoserver.cloud.it</groupId>
+    <artifactId>integration-tests</artifactId>
+    <version>${revision}</version>
+  </parent>
+  <artifactId>gs-cloud-config-sync-it</artifactId>
+  <packaging>jar</packaging>
+  <description>Cluster config synchronization integration tests</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>gs-cloud-starter-webmvc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>gs-cloud-starter-vector-formats</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>gs-cloud-starter-raster-formats</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud.catalog</groupId>
+      <artifactId>gs-cloud-catalog-plugin</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>rabbitmq</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <configuration>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <trimStackTrace>false</trimStackTrace>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>