Merge pull request #1057 from microsoft/trask/support-smoke-tests-on-…

…yum-based-images Support smoke tests on yum-based images
microsoft · Sep 5, 2019 · 9a4fef2 · 9a4fef2
2 parents 16e102c + 3d7fa8a
commit 9a4fef2
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/test/smoke/appServers/JBossEAP.6/jbosseap6.linux.partial.dockerfile b/test/smoke/appServers/JBossEAP.6/jbosseap6.linux.partial.dockerfile
@@ -3,11 +3,12 @@ FROM @JRE@
 USER root
 WORKDIR /root/docker-compile
 
-# update packages and install dependencies: wget
-RUN apt-get update \
-    && apt-get install -y wget \
-    && apt-get install -y procps \
-    && apt-get install -y unzip
+# update packages and install dependencies: wget unzip
+RUN if type "apt-get" > /dev/null; then \
+      apt-get update && apt-get install -y wget unzip procps; \
+    else \
+      yum install -y wget unzip procps; \
+    fi
 
 # add jboss zip
 ADD ./@ZIP_FILENAME@ ./

diff --git a/test/smoke/appServers/JBossEAP.7/jbosseap7.linux.partial.dockerfile b/test/smoke/appServers/JBossEAP.7/jbosseap7.linux.partial.dockerfile
@@ -3,11 +3,12 @@ FROM @JRE@
 USER root
 WORKDIR /root/docker-compile
 
-# update packages and install dependencies: wget
-RUN apt-get update \
-    && apt-get install -y wget \
-    && apt-get install -y procps \
-    && apt-get install -y unzip
+# update packages and install dependencies: wget unzip
+RUN if type "apt-get" > /dev/null; then \
+      apt-get update && apt-get install -y wget unzip procps; \
+    else \
+      yum install -y wget unzip procps; \
+    fi
 
 # add jboss zip
 ADD ./@ZIP_FILENAME@ ./

diff --git a/test/smoke/appServers/Jetty.9/jetty9.linux.partial.dockerfile b/test/smoke/appServers/Jetty.9/jetty9.linux.partial.dockerfile
@@ -2,9 +2,12 @@ FROM @JRE@
 
 WORKDIR /usr/local/docker-compile
 
-# update packages and install dependencies: wget procps (we need 'ps' for debugging)
-RUN apt-get update \
-    && apt-get install -y wget procps
+# update packages and install dependencies: wget
+RUN if type "apt-get" > /dev/null; then \
+      apt-get update && apt-get install -y wget procps; \
+    else \
+      yum install -y wget procps; \
+    fi
 
 ENV JETTY_FULL_VERSION 9.4.17.v20190418
 

diff --git a/test/smoke/appServers/Tomcat.7/tomcat7.linux.partial.dockerfile b/test/smoke/appServers/Tomcat.7/tomcat7.linux.partial.dockerfile
@@ -6,11 +6,11 @@ WORKDIR /root/docker-compile
 RUN mkdir /root/docker-stage
 
 # update packages and install dependencies: wget
-RUN apt-get update \
-    && apt-get install -y wget
-
-RUN apt-get install -y procps
-
+RUN if type "apt-get" > /dev/null; then \
+      apt-get update && apt-get install -y wget procps; \
+    else \
+      yum install -y wget procps; \
+    fi
 
 ENV TOMCAT_MAJOR_VERSION 7
 ENV TOMCAT_FULL_VERSION 7.0.94

diff --git a/test/smoke/appServers/Tomcat.8.5/tomcat85.linux.partial.dockerfile b/test/smoke/appServers/Tomcat.8.5/tomcat85.linux.partial.dockerfile
@@ -6,8 +6,11 @@ WORKDIR /root/docker-compile
 RUN mkdir /root/docker-stage
 
 # update packages and install dependencies: wget
-RUN apt-get update \
-    && apt-get install -y wget procps
+RUN if type "apt-get" > /dev/null; then \
+      apt-get update && apt-get install -y wget procps; \
+    else \
+      yum install -y wget procps; \
+    fi
 
 ENV TOMCAT_MAJOR_VERSION 8
 ENV TOMCAT_FULL_VERSION 8.5.40