diff --git a/.drone.yml b/.drone.yml index b93e52e..a089a3e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: - name: test-offline image: maven:3-jdk-11-slim commands: - - mvn clean test -Dtest='!HTTPVaultConnectorTest' + - mvn clean test -P offline-tests when: branch: - develop diff --git a/.travis.yml b/.travis.yml index 0ec610e..0ca91ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,3 @@ -branches: - only: - - master language: java jdk: - openjdk11 @@ -13,16 +10,24 @@ addons: env: - PATH=$PATH:. VAULT_VERSION=1.1.3 before_script: - - wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_${VAULT_VERSION}_linux_amd64.zip - - rm vault_${VAULT_VERSION}_linux_amd64.zip + - | + if [ "$TRAVIS_BRANCH" = "master" ]; then + wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip + wget -q -O - https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_SHA256SUMS | grep linux_amd64 | sha256sum -c + unzip vault_${VAULT_VERSION}_linux_amd64.zip + rm vault_${VAULT_VERSION}_linux_amd64.zip + fi cache: directories: - '$HOME/.m2/repository' - '$HOME/.sonar/cache' script: - - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar + - | + if [ "$TRAVIS_BRANCH" = "master" ]; then + mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar + else + mvn clean test -P offline-tests + fi notifications: slack: secure: "YyE5GePOLkCVTtCy8j507BRmQrtrWhtvmUt4kY0Z2/ptf0LzfuDEJQ4ZbCxO5ri5IDJrrvyPAedjft818+bMzdFfxvi1oviIL+LZNhyev8gfeIBF/U2pvSLGKCRX4g4aZ6NKN3Untjdm8lmiVTltOyZ59JizQVwXzAl3LiOpnJugyBqbhOx4EIqBzwW3gaYAofMqY2LczW5W/M+99HJCst8Mb8H06GstCPEHCizAq7VRaUS68PstlxQMV0Q6bsSYMLFbLWmhuXs96WHqOrT+nNsl07ikr3N8c4HafhFutt2Jyc1+8gXO417+eSvVM0iBpHGwTmfGFfCqx/4Pf62DTJuvh8dR4fLgLDiqEeDrBEcRRDOs9cvXVOO22NN1HuBBJY8VRiFcwNAvuVMXCtnC+1RJRAZB2zubsANiFe+ygk/ywj37cVXY+NpqlBwcSph6jPHo2hD6cIl2rTWn1EnZH519Rh38xTSv6MRzAO9kWNVrAlX+UtvYS8Sk7Owrc0tET9Lc4zj6aI5tsA1wYbN3Jk6EbMhsF6K/XF2npt2qg09pxkj8wmxoUoR6/rGuSv55aSxTdLDmH+en4ahEm3uc4h1lYoVCk0yrZoTAas3zS4WpBCKnl+mweuKNxaejyy0Wv6NR9ZCTaS3yFgibNOjvDpxZxTAPdNBL7hn+k4LwgN4=" diff --git a/pom.xml b/pom.xml index 6bda5ac..ca6cb3f 100644 --- a/pom.xml +++ b/pom.xml @@ -214,5 +214,22 @@ + + + offline-tests + + + + + org.apache.maven.plugins + maven-surefire-plugin + + online + + + + + + diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 2f661bf..c5f5c83 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -19,7 +19,9 @@ package de.stklcode.jvault.connector; import de.stklcode.jvault.connector.builder.HTTPVaultConnectorBuilder; import de.stklcode.jvault.connector.builder.VaultConnectorBuilder; import de.stklcode.jvault.connector.exception.*; -import de.stklcode.jvault.connector.model.*; +import de.stklcode.jvault.connector.model.AppRole; +import de.stklcode.jvault.connector.model.AuthBackend; +import de.stklcode.jvault.connector.model.Token; import de.stklcode.jvault.connector.model.response.*; import de.stklcode.jvault.connector.test.Credentials; import de.stklcode.jvault.connector.test.VaultConfiguration; @@ -50,6 +52,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; * @author Stefan Kalscheuer * @since 0.1 */ +@Tag("online") public class HTTPVaultConnectorTest { private static String VAULT_VERSION = "1.1.3"; // the vault version this test is supposed to run against private static final String KEY1 = "E38bkCm0VhUvpdCKGQpcohhD9XmcHJ/2hreOSY019Lho";