mirror of
https://github.com/Kingsrook/qqq.git
synced 2025-07-17 20:50:44 +00:00
Switching to use localstack executor, to get filesystem s3 tests running again
Revert "Moving the DisabledOnOs down to the subclasses, not the base class"
This reverts commit 715c6f36d0
.
This commit is contained in:
@ -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
|
||||
|
@ -33,7 +33,7 @@
|
||||
|
||||
<properties>
|
||||
<!-- props specifically to this module -->
|
||||
<coverage.instructionCoveredRatioMinimum>0.60</coverage.instructionCoveredRatioMinimum>
|
||||
<!-- none at this time -->
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
@ -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
|
||||
{
|
||||
|
||||
|
@ -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";
|
||||
|
@ -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
|
||||
{
|
||||
|
||||
|
@ -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
|
||||
{
|
||||
|
||||
|
Reference in New Issue
Block a user