diff --git a/.circleci/config.yml b/.circleci/config.yml index 74950f5f..7d7aa105 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,15 +1,19 @@ version: 2.1 -executors: - java17: - docker: - - image: 'cimg/openjdk:17.0' - resource_class: small - orbs: slack: circleci/slack@4.10.1 + localstack: localstack/platform@1.0 commands: + install_java17: + steps: + - run: + name: Install Java 17 + command: | + sudo add-apt-repository -y ppa:openjdk-r/ppa + sudo apt install -y openjdk-17-jdk + sudo rm /etc/alternatives/java + sudo ln -s /usr/lib/jvm/java-17-openjdk-amd64/bin/java /etc/alternatives/java mvn_verify: steps: - checkout @@ -21,7 +25,17 @@ commands: command: | mvn -s .circleci/mvn-settings.xml verify - store_artifacts: - path: "*/target/site/jacoco" + path: qqq-backend-core/target/site/jacoco + - store_artifacts: + path: qqq-backend-module-filesystem/target/site/jacoco + - store_artifacts: + path: qqq-backend-module-rdbms/target/site/jacoco + - store_artifacts: + path: qqq-middleware-javalin/target/site/jacoco + - store_artifacts: + path: qqq-middleware-picocli/target/site/jacoco + - store_artifacts: + path: qqq-sample-project/target/site/jacoco - run: name: Save test results command: | @@ -52,14 +66,16 @@ commands: jobs: mvn_test: - executor: java17 + executor: localstack/default steps: + - localstack/startup + - install_java17 - mvn_verify - slack/notify: event: fail mvn_deploy: - executor: java17 + executor: localstack/default steps: - mvn_verify - mvn_jar_deploy diff --git a/qqq-backend-module-filesystem/pom.xml b/qqq-backend-module-filesystem/pom.xml index a63fc9a5..32cc274f 100644 --- a/qqq-backend-module-filesystem/pom.xml +++ b/qqq-backend-module-filesystem/pom.xml @@ -33,7 +33,7 @@ - 0.60 + diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessS3Test.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessS3Test.java index aec2f16f..551f5f0b 100644 --- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessS3Test.java +++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncProcessS3Test.java @@ -45,8 +45,6 @@ import com.kingsrook.qqq.backend.module.filesystem.s3.actions.AbstractS3Action; import com.kingsrook.qqq.backend.module.filesystem.s3.model.metadata.S3BackendMetaData; import com.kingsrook.qqq.backend.module.filesystem.s3.model.metadata.S3TableBackendDetails; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -54,7 +52,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /******************************************************************************* ** Unit test for FilesystemSyncProcess using S3 backend *******************************************************************************/ -@DisabledOnOs(OS.LINUX) class FilesystemSyncProcessS3Test extends BaseS3Test { diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java index 07dc3af4..8474e5ae 100644 --- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java +++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java @@ -32,14 +32,11 @@ import com.kingsrook.qqq.backend.module.filesystem.exceptions.FilesystemExceptio import com.kingsrook.qqq.backend.module.filesystem.s3.actions.AbstractS3Action; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; /******************************************************************************* ** Unit test for S3BackendModule *******************************************************************************/ -@DisabledOnOs(OS.LINUX) public class S3BackendModuleTest extends BaseS3Test { private final String PATH_THAT_WONT_EXIST = "some/path/that/wont/exist"; diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryActionTest.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryActionTest.java index 3898c592..ef84e292 100644 --- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryActionTest.java +++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3QueryActionTest.java @@ -31,14 +31,11 @@ import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemRecordBackendD import com.kingsrook.qqq.backend.module.filesystem.s3.BaseS3Test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; /******************************************************************************* ** *******************************************************************************/ -@DisabledOnOs(OS.LINUX) public class S3QueryActionTest extends BaseS3Test { diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/utils/S3UtilsTest.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/utils/S3UtilsTest.java index e28324d1..ed4afbdf 100644 --- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/utils/S3UtilsTest.java +++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/utils/S3UtilsTest.java @@ -29,15 +29,12 @@ import com.amazonaws.services.s3.model.S3ObjectSummary; import com.kingsrook.qqq.backend.module.filesystem.s3.BaseS3Test; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertEquals; /******************************************************************************* ** *******************************************************************************/ -@DisabledOnOs(OS.LINUX) public class S3UtilsTest extends BaseS3Test {