Fixes fabric8io#1187 Fix regression tests in order to get them working on Openshift 3.7

rohanKanojia · rohanKanojia · commit 7ff4498d9980 · 2018-02-15T19:14:10.000+05:30
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ matrix:
   include:
     - env: OC_VERSION="v3.6.0" COMMIT_ID="c4dd4cf"
     - env: OC_VERSION="v3.6.1" COMMIT_ID="008f2d5"
-    #- env: OC_VERSION="v3.7.0" COMMIT_ID="7ed6862"
+    - env: OC_VERSION="v3.7.0" COMMIT_ID="7ed6862"
 
 sudo: required
 dist: trusty
@@ -33,7 +33,7 @@ before_script: ./mvnw clean install -DskipTests
 
 script:
   # Profile jacoco switches on jacoco coverages, regession-test for running regreesion tests on fabric8/OpenShift.io quickstart projects
-  - ./mvnw -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B install -pl rt -P regression-test
+  - travis_wait 180 ./mvnw -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B install -pl rt -P regression-test
    # Only build docs when commited on master and not a pull request.
    # See https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
    # for more details about Travis default vars
diff --git a/rt/src/main/resources/scripts/prepare-test-environment.sh b/rt/src/main/resources/scripts/prepare-test-environment.sh
@@ -12,6 +12,42 @@ curl -LO https://github.com/openshift/origin/releases/download/${OC_VERSION}/${o
     rm -rf ${oc_tool_version}.tar.gz
 echo "Installed OC CLI tool"
 
+# OpenShift >= 3.7 requires nsenter
+if ! which nsenter > /dev/null; then
+  echo "Did not find nsenter. Installing it."
+  NSENTER_BUILD_DIR=$(mktemp -d /tmp/nsenter-build-XXXXXX)
+  pushd ${NSENTER_BUILD_DIR}
+  curl https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-2.31.tar.gz | tar -zxf-
+  cd util-linux-2.31
+  ./configure --without-ncurses
+  make nsenter
+  sudo cp nsenter /usr/local/bin
+  rm -rf "${NSENTER_BUILD_DIR}"
+  popd
+fi
+# OpenShift >= 3.7 requires systemd-run (but Ubuntu Trusty still uses Init)
+# Should be in Kubernetes to correctly detect if systemd-run is present -
+# Hack it till then
+if ! which systemd-run > /dev/null; then
+  echo "Did not find systemd-run. Hacking it to work around Kubernetes calling it."
+  echo '#!/bin/bash
+  echo "all arguments: "$@
+  while [[ $# -gt 0 ]]
+  do
+    key="$1"
+    if [[ "${key}" != "--" ]]; then
+      shift
+      continue
+    fi
+    shift
+    break
+  done
+  echo "remaining args: "$@
+  exec $@' | sudo tee /usr/bin/systemd-run >/dev/null
+  sudo chmod +x /usr/bin/systemd-run
+fi
+
+
 #add insecure docker registry
 tmp=`mktemp`
 echo 'DOCKER_OPTS="$DOCKER_OPTS --insecure-registry 172.30.0.0/16"' > ${tmp}
diff --git a/rt/src/test/java/io/fabric8/maven/rt/BaseBoosterIT.java b/rt/src/test/java/io/fabric8/maven/rt/BaseBoosterIT.java
@@ -377,7 +377,7 @@ protected void waitTillApplicationPodStarts(String key, String value) throws Int
 
         int nPolls = 0;
         // Keep polling till 5 minutes
-        while (nPolls < 60) {
+        while (nPolls < 120) {
             PodList podList = openShiftClient.pods().withLabel("app", testsuiteRepositoryArtifactId).list();
             for (Pod pod : podList.getItems()) {
                 logger.info("waitTillApplicationPodStarts(" + key + ", " + value + ") -> Pod : "
diff --git a/rt/src/test/java/io/fabric8/maven/rt/SpringbootConfigmapBoosterIT.java b/rt/src/test/java/io/fabric8/maven/rt/SpringbootConfigmapBoosterIT.java
@@ -35,7 +35,7 @@ public class SpringbootConfigmapBoosterIT extends BaseBoosterIT {
 
     private final String TESTSUITE_CONFIGMAP_NAME = "app-config";
 
-    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy -DskipTests", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
+    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy -Dfabric8.openshift.trimImageInContainerSpec=true -DskipTests", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
 
     private final String TEST_ENDPOINT = "/api/greeting";
 
@@ -49,9 +49,11 @@ public void deploy_springboot_app_once() throws Exception {
 
         createViewRoleToServiceAccount();
         createConfigMapResourceForApp(TESTSUITE_CONFIGMAP_NAME, "greeting.message: Hello World from a ConfigMap!");
+        addRedeploymentAnnotations(testRepository, RELATIVE_POM_PATH, "deploymentType", "deployOnce", fmpConfigurationFile);
 
         deploy(testRepository, EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL, EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE);
-        waitAfterDeployment(false);
+        waitTillApplicationPodStarts("deploymentType", "deployOnce");
+        TimeUnit.SECONDS.sleep(20);
         assertApplication(false);
 
         openShiftClient.configMaps().inNamespace(testsuiteNamespace).withName(TESTSUITE_CONFIGMAP_NAME).delete();
diff --git a/rt/src/test/java/io/fabric8/maven/rt/SpringbootCrudBoosterIT.java b/rt/src/test/java/io/fabric8/maven/rt/SpringbootCrudBoosterIT.java
@@ -31,7 +31,7 @@
 public class SpringbootCrudBoosterIT extends BaseBoosterIT {
     private final String SPRING_BOOT_CRUD_BOOSTER_GIT = "https://github.com/snowdrop/spring-boot-crud-booster.git";
 
-    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy -DskipTests", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
+    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy -Dfabric8.openshift.trimImageInContainerSpec=true -DskipTests", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
 
     private final String TEST_ENDPOINT = "/api/fruits";
 
@@ -46,8 +46,11 @@ public void deploy_springboot_app_once() throws Exception {
         Repository testRepository = setupSampleTestRepository(SPRING_BOOT_CRUD_BOOSTER_GIT, RELATIVE_POM_PATH);
         deployDatabaseUsingCLI();
 
+        addRedeploymentAnnotations(testRepository, RELATIVE_POM_PATH, "deploymentType", "deployOnce", fmpConfigurationFile);
+
         deploy(testRepository, EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL, EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE);
-        waitAfterDeployment(false);
+        waitTillApplicationPodStarts("deploymentType", "deployOnce");
+        TimeUnit.SECONDS.sleep(20);
         assertApplication();
     }
 
diff --git a/rt/src/test/java/io/fabric8/maven/rt/SpringbootHttpBoosterIT.java b/rt/src/test/java/io/fabric8/maven/rt/SpringbootHttpBoosterIT.java
@@ -22,6 +22,8 @@
 import org.junit.After;
 import org.testng.annotations.Test;
 
+import java.util.concurrent.TimeUnit;
+
 import static io.fabric8.kubernetes.assertions.Assertions.assertThat;
 
 /**
@@ -35,16 +37,19 @@ public class SpringbootHttpBoosterIT extends BaseBoosterIT {
 
     private final String FMP_CONFIGURATION_FILE = "/fmp-plugin-config.xml";
 
-    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
+    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy -Dfabric8.openshift.trimImageInContainerSpec=true", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
 
     private final String RELATIVE_POM_PATH = "/pom.xml";
 
     @Test
     public void deploy_springboot_app_once() throws Exception {
         Repository testRepository = setupSampleTestRepository(SPRING_BOOT_HTTP_BOOSTER_GIT, RELATIVE_POM_PATH);
 
+        addRedeploymentAnnotations(testRepository, RELATIVE_POM_PATH, "deploymentType", "deployOnce", fmpConfigurationFile);
+
         deploy(testRepository, EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL, EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE);
-        waitUntilDeployment(false);
+        waitTillApplicationPodStarts("deploymentType", "deployOnce");
+        TimeUnit.SECONDS.sleep(20);
         assertApplication();
     }
 
diff --git a/rt/src/test/java/io/fabric8/maven/rt/VertxConfigmapBoosterIT.java b/rt/src/test/java/io/fabric8/maven/rt/VertxConfigmapBoosterIT.java
@@ -36,7 +36,7 @@ public class VertxConfigmapBoosterIT extends BaseBoosterIT {
 
     private final String TESTSUITE_CONFIGMAP_NAME = "app-config";
 
-    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy -DskipTests", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
+    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy -Dfabric8.openshift.trimImageInContainerSpec=true -DskipTests", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
 
     private final String TEST_ENDPOINT = "/api/greeting";
 
@@ -52,8 +52,11 @@ public void deploy_vertx_app_once() throws Exception {
 
         createViewRoleToServiceAccount();
         createConfigMapResourceForApp(TESTSUITE_CONFIGMAP_NAME);
+        addRedeploymentAnnotations(testRepository, RELATIVE_POM_PATH, "deploymentType", "deployOnce", fmpConfigurationFile);
+
         deploy(testRepository, EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL, EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE);
-        waitAfterDeployment(false);
+        waitTillApplicationPodStarts("deploymentType", "deployOnce");
+        TimeUnit.SECONDS.sleep(20);
         assertDeployment(false);
 
         openShiftClient.configMaps().inNamespace(testsuiteNamespace).withName(TESTSUITE_CONFIGMAP_NAME).delete();
diff --git a/rt/src/test/java/io/fabric8/maven/rt/VertxHealthchecksBooster.java b/rt/src/test/java/io/fabric8/maven/rt/VertxHealthchecksBooster.java
@@ -31,7 +31,7 @@
 public class VertxHealthchecksBooster extends BaseBoosterIT {
     private final String SPRING_BOOT_HTTP_BOOSTER_GIT = "https://github.com/openshiftio-vertx-boosters/vertx-health-checks-booster.git";
 
-    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
+    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy -Dfabric8.openshift.trimImageInContainerSpec=true", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
 
     private final String RELATIVE_POM_PATH = "/pom.xml";
 
@@ -41,8 +41,11 @@ public class VertxHealthchecksBooster extends BaseBoosterIT {
     public void deploy_vertx_app_once() throws Exception {
         Repository testRepository = setupSampleTestRepository(SPRING_BOOT_HTTP_BOOSTER_GIT, RELATIVE_POM_PATH);
 
+        addRedeploymentAnnotations(testRepository, RELATIVE_POM_PATH, "deploymentType", "deployOnce", fmpConfigurationFile);
+
         deploy(testRepository, EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL, EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE);
-        waitAfterDeployment(false);
+        waitTillApplicationPodStarts("deploymentType", "deployOnce");
+        TimeUnit.SECONDS.sleep(20);
         assertDeployment();
     }
 
diff --git a/rt/src/test/java/io/fabric8/maven/rt/VertxHttpBoosterIT.java b/rt/src/test/java/io/fabric8/maven/rt/VertxHttpBoosterIT.java
@@ -33,7 +33,7 @@
 public class VertxHttpBoosterIT extends BaseBoosterIT {
     private final String SPRING_BOOT_HTTP_BOOSTER_GIT = "https://github.com/openshiftio-vertx-boosters/vertx-http-booster.git";
 
-    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
+    private final String EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL = "fabric8:deploy -Dfabric8.openshift.trimImageInContainerSpec=true", EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE = "openshift";
 
     private final String RELATIVE_POM_PATH = "/pom.xml";
 
@@ -45,8 +45,11 @@ public class VertxHttpBoosterIT extends BaseBoosterIT {
     public void deploy_vertx_app_once() throws Exception {
         Repository testRepository = setupSampleTestRepository(SPRING_BOOT_HTTP_BOOSTER_GIT, RELATIVE_POM_PATH);
 
+        addRedeploymentAnnotations(testRepository, RELATIVE_POM_PATH, "deploymentType", "deployOnce", fmpConfigurationFile);
+
         deploy(testRepository, EMBEDDED_MAVEN_FABRIC8_BUILD_GOAL, EMBEDDED_MAVEN_FABRIC8_BUILD_PROFILE);
-        waitTillApplicationPodStarts();
+        waitTillApplicationPodStarts("deploymentType", "deployOnce");
+        TimeUnit.SECONDS.sleep(20);
         assertDeployment();
     }
 
