run codecov only on one run

KostyaSha · KostyaSha · commit 007f66899f9a · 2016-07-08T02:12:48.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -21,8 +21,7 @@ env:
     - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true FAST_BUILD=true COVERITY=true
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true COVERITY=true CODECOV=true
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
 #    - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
diff --git a/.travis/travis-after-success.sh b/.travis/travis-after-success.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
+if [[ $CODECOV == "true" ]]; then
+    codecov
+fi
 
-codecov
 if [[ $TRAVIS_BRANCH == "master" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $DEPLOY == "true" ]];
 then
     cat <<EOF >> ~/settings.xml
diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh
@@ -28,8 +28,7 @@ sudo -E apt-cache policy docker-engine
 # sudo apt-get -f install
 # sudo dpkg -i "$(ls *${DOCKER_VERSION}*)"
 #popd
-#rm -f "src/test/resources/logback.xml"
-mv "src/test/resources/travis-logback.xml" "src/test/resources/logback.xml"
+
 
 echo 'DOCKER_OPTS="-H=unix:///var/run/docker.sock -H=tcp://127.0.0.1:2375"' | sudo tee -a /etc/default/docker
 sudo -E restart docker
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -19,7 +19,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
-@Test(groups = "integration-auth")
+@Test(groups = {"integration-auth", "integration"})
 public class PushImageCmdImplTest extends AbstractDockerClientTest {
 
     public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdImplTest.class);
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
@@ -21,7 +21,7 @@
 import com.github.dockerjava.core.command.PushImageResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
-@Test(groups = "integration-auth")
+@Test(groups = {"integration", "integration-auth"})
 public class PushImageCmdExecTest extends AbstractNettyDockerClientTest {
 
     public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdExecTest.class);
