fix MAS CI : custom image for running postgresql + tests (#1846)

Author: Fabian Martinez

Dockerfile.testing

@@ -0,0 +1,30 @@
+FROM quay.io/app-sre/postgres
+
+ENV POSTGRES_PASSWORD test
+ENV POSTGRES_USER test
+ENV POSTGRES_DB test
+
+RUN apt-get update
+RUN apt-get install -y make openjdk-11-jdk curl
+
+RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
+  && curl -fsSL -o /tmp/apache-maven.tar.gz https://apache.osuosl.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz \
+  && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \
+  && rm -f /tmp/apache-maven.tar.gz \
+  && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+
+# copy the setup scripts and the pr check script
+COPY pr_check_docker.sh /docker-entrypoint-initdb.d/
+
+# copy over the kas-fleet-manager
+RUN mkdir -p /opt/srs/apicurio-registry
+COPY . /opt/srs/apicurio-registry
+
+# Docker built / owned  as 'root' but the 'postgres' user runs the image
+RUN chown -R postgres:postgres /opt/srs/apicurio-registry /usr/bin/mvn
+
+WORKDIR /opt/srs/apicurio-registry
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+CMD ["postgres"]

Makefile

@@ -209,16 +209,17 @@ push-all-images: push-mem-image push-sql-image push-kafkasql-image push-tenant-m
 
 .PHONY: pr-check ## Builds and runs basic tests for multitenant registry pipelines
 pr-check:
-# TODO undo skipping tests for main build and running tests just for app module
-	CURRENT_ENV=mas mvn clean install -Pno-docker -Dskip.yarn -Pprod -Psql -Pmultitenancy -am -pl app -Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false
 	CURRENT_ENV=mas mvn clean install -Pno-docker -Dskip.yarn -Pprod -Psql -Pmultitenancy -am -pl storage/sql,multitenancy/tenant-manager-api \
-		-Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false -DskipTests
-#	NO_DOCKER=true mvn verify -Pintegration-tests -Pmultitenancy -Psql -am -pl integration-tests/testsuite \
-#		-Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false
+		-Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false
+	./scripts/clean-postgres.sh
+	CURRENT_ENV=mas NO_DOCKER=true mvn verify -Pintegration-tests -Pmultitenancy -Psql -am -pl integration-tests/testsuite \
+		-Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false
 
 .PHONY: build-project ## Builds the components for multitenant registry pipelines
 build-project:
-# TODO undo skipping tests for main build and running tests just for app module
+# run unit tests for app module
+	CURRENT_ENV=mas mvn clean install -Pno-docker -Dskip.yarn -Pprod -Psql -Pmultitenancy -am -pl app -Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false
+# build everything without running tests in order to be able to build container images
 	CURRENT_ENV=mas mvn clean install -Pprod -Pno-docker -Dskip.yarn -Psql -Pmultitenancy -Dmaven.javadoc.skip=true --no-transfer-progress -DtrimStackTrace=false -DskipTests
 
 # Please declare your targets as .PHONY in the format shown below, so that the 'make help' parses the information correctly.

app/src/test/java/io/apicurio/registry/ImportLifecycleBeanTest.java

@@ -5,6 +5,7 @@
 import io.quarkus.test.junit.TestProfile;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -14,6 +15,7 @@
 
 @QuarkusTest
 @TestProfile(ImportLifecycleBeanTestProfile.class)
+@DisabledIfEnvironmentVariable(named = AbstractRegistryTestBase.CURRENT_ENV, matches = AbstractRegistryTestBase.CURRENT_ENV_MAS_REGEX)
 public class ImportLifecycleBeanTest extends AbstractResourceTestBase {
 
     @Override

app/src/test/java/io/apicurio/registry/RegistryClientTest.java

@@ -48,6 +48,7 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -933,6 +934,7 @@ public void smokeLogLevels() {
     }
 
     @Test
+    @DisabledIfEnvironmentVariable(named = AbstractRegistryTestBase.CURRENT_ENV, matches = AbstractRegistryTestBase.CURRENT_ENV_MAS_REGEX)
     public void testDefaultGroup() throws Exception {
         String nullDefaultGroup = null;
         String artifactId1 = "testDefaultGroup-" + UUID.randomUUID().toString();

app/src/test/java/io/apicurio/registry/limits/LimitsTest.java

@@ -24,6 +24,9 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
+
+import io.apicurio.registry.AbstractRegistryTestBase;
 import io.apicurio.registry.AbstractResourceTestBase;
 import io.apicurio.registry.rest.client.exception.LimitExceededException;
 import io.apicurio.registry.rest.v2.beans.EditableMetaData;
@@ -38,6 +41,7 @@
  */
 @QuarkusTest
 @TestProfile(LimitsTestProfile.class)
+@DisabledIfEnvironmentVariable(named = AbstractRegistryTestBase.CURRENT_ENV, matches = AbstractRegistryTestBase.CURRENT_ENV_MAS_REGEX)
 public class LimitsTest extends AbstractResourceTestBase {
 
     @Test

integration-tests/integration-tests-common/src/main/java/io/apicurio/tests/common/RegistryFacade.java

@@ -482,8 +482,44 @@ public boolean isContainer() {
     private void setupSQLStorage(Map<String, String> appEnv) throws Exception {
 
         String noDocker = System.getenv("NO_DOCKER");
+        String currentEnv = System.getenv("CURRENT_ENV");
 
-        if (noDocker != null && noDocker.equals("true")) {
+        if (currentEnv != null && "mas".equals(currentEnv)) {
+
+            //postgresql running in a pre-deployed container
+
+            appEnv.put("REGISTRY_DATASOURCE_URL", "jdbc:postgresql://localhost:5432/test");
+            appEnv.put("REGISTRY_DATASOURCE_USERNAME", "test");
+            appEnv.put("REGISTRY_DATASOURCE_PASSWORD", "test");
+
+            processes.add(new RegistryTestProcess() {
+
+                @Override
+                public String getName() {
+                    return "container-postgresql";
+                }
+
+                @Override
+                public void close() throws Exception {
+                }
+
+                @Override
+                public String getStdOut() {
+                    return "";
+                }
+
+                @Override
+                public String getStdErr() {
+                    return "";
+                }
+
+                @Override
+                public boolean isContainer() {
+                    return false;
+                }
+            });
+
+        } else if (noDocker != null && noDocker.equals("true")) {
             EmbeddedPostgres database = EmbeddedPostgres.start();
 
 

pr-check.sh

@@ -38,12 +38,18 @@ build_project() {
     # docker run --rm -t -u $(id -u):$(id -g) -w /home/user -v $(pwd):/home/user quay.io/riprasad/srs-project-builder:latest bash -c "${MVN_BUILD_COMMAND}"
 
     #TODO confirm we are ok with this, using this ci-tools image is the recomended way, but using this we don't control the java nor maven version...
-    docker pull quay.io/app-sre/mk-ci-tools:latest
-    docker run -v $(pwd):/opt/srs -w /opt/srs -e HOME=/tmp -u $(id -u) \
-        -e LANG=en_US.UTF-8 \
-        -e LANGUAGE=en_US:en \
-        -e LC_ALL=en_US.UTF-8 \
-        quay.io/app-sre/mk-ci-tools:latest make pr-check
+    # docker pull quay.io/app-sre/mk-ci-tools:latest
+    # docker run -v $(pwd):/opt/srs -w /opt/srs -e HOME=/tmp -u $(id -u) \
+    #     -e LANG=en_US.UTF-8 \
+    #     -e LANGUAGE=en_US:en \
+    #     -e LC_ALL=en_US.UTF-8 \
+    #     quay.io/app-sre/mk-ci-tools:latest make pr-check
+
+
+    docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
+    docker build -t apicurio-registry-test -f Dockerfile.testing .
+    docker run -i apicurio-registry-test
+
 }
 
 main() { 

pr_check_docker.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -ex
+
+# start postgres
+which pg_ctl
+PGDATA=/var/lib/postgresql/data /usr/lib/postgresql/*/bin/pg_ctl -w stop
+PGDATA=/var/lib/postgresql/data /usr/lib/postgresql/*/bin/pg_ctl start -o "-c listen_addresses='*' -p 5432"
+
+echo "Running make pr-check"
+make pr-check
+
+# required for entrypoint script run by docker to exit and stop container
+exit 0

scripts/clean-postgres.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+PGPASSWORD=test psql -h localhost -p 5432 -U test -d test -a -f scripts/clean-postgres.sql

scripts/clean-postgres.sql

@@ -0,0 +1,24 @@
+DROP TABLE apicurio;
+
+DROP SEQUENCE contentidsequence;
+DROP SEQUENCE globalidsequence;
+
+DROP TABLE globalrules;
+
+DROP TABLE artifacts CASCADE;
+
+DROP TABLE rules CASCADE;
+
+DROP TABLE content CASCADE;
+
+DROP TABLE versions CASCADE;
+
+DROP TABLE properties CASCADE;
+
+DROP TABLE labels CASCADE;
+
+DROP TABLE logconfiguration;
+
+DROP TABLE groups;
+
+DROP TABLE acls;

storage/sql/src/test/java/io/apicurio/registry/storage/util/PostgreSqlEmbeddedTestResource.java

@@ -37,6 +37,20 @@ public class PostgreSqlEmbeddedTestResource implements QuarkusTestResourceLifecy
     @Override
     public Map<String, String> start() {
 
+        String currentEnv = System.getenv("CURRENT_ENV");
+
+        if (currentEnv != null && "mas".equals(currentEnv)) {
+            Map<String, String> props = new HashMap<>();
+            props.put("quarkus.datasource.jdbc.url", "jdbc:postgresql://localhost:5432/test");
+            props.put("quarkus.datasource.username", "test");
+            props.put("quarkus.datasource.password", "test");
+            return props;
+        } else {
+            return startPostgresql();
+        }
+    }
+
+    private Map<String, String> startPostgresql() {
         try {
             database = EmbeddedPostgres.start();
         } catch (IOException e) {