Fix Red Hat 7 compatibility

phusion · Apr 30, 2015 · 37166dd · 37166dd
1 parent e910426
commit 37166dd
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 10 deletions.
diff --git a/docker_images/testbox-centos-6/install.sh b/docker_images/testbox-centos-6/install.sh
@@ -23,6 +23,7 @@ header "Installing dependencies"
 run rpm -Uvh http://mirror.overthewire.com.au/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
 run yum install -y --enablerepo centosplus centos-release-SCL
 run yum install -y --enablerepo centosplus \
+	@development-tools \
 	python27-python nodejs010-nodejs nodejs010-npm \
 	ruby ruby-devel rubygems rubygem-rack rubygem-rake perl git tar which \
 	httpd httpd-devel httpd-tools zlib-devel sqlite-devel curl-devel \

diff --git a/docker_images/testbox-centos-7/install.sh b/docker_images/testbox-centos-7/install.sh
@@ -21,8 +21,9 @@ run adduser --uid 2467 --gid 2467 --password '#' app
 
 header "Installing dependencies"
 run yum install -y --enablerepo centosplus epel-release centos-release-SCL
+run yum group install -y "Development Tools"
 run yum install -y --enablerepo centosplus \
-	ruby ruby-devel rubygems rubygem-rack rubygem-rake nodejs \
+	ruby ruby-devel rubygems rubygem-rack rubygem-rake nodejs npm \
 	perl git tar which \
 	httpd httpd-devel httpd-tools zlib-devel sqlite-devel curl-devel \
 	GeoIP gd libxslt

diff --git a/internal/build/Rakefile b/internal/build/Rakefile
@@ -89,7 +89,7 @@ namespace :srpm do
           raise e
         end
 
-        task.sh "rpmbuild -bs --root ~/rpmbuild/root_passenger #{spec_target_file}"
+        task.sh "rpmbuild -bs --root ~/rpmbuild/root-passenger-#{distro_id} #{spec_target_file}"
         ARCHITECTURES.each do |arch|
           task.sh "mkdir -p /work/#{distro_id}-#{arch}"
           task.sh "cp #{RPM_SRPMS_DIR}/#{passenger_srpm_name(distro_id)} /work/#{distro_id}-#{arch}/"
@@ -126,7 +126,7 @@ namespace :srpm do
           raise e
         end
 
-        task.sh "rpmbuild -bs --root ~/rpmbuild/root_nginx #{spec_target_file}"
+        task.sh "rpmbuild -bs --root ~/rpmbuild/root-nginx-#{distro_id} #{spec_target_file}"
         ARCHITECTURES.each do |arch|
           task.sh "mkdir -p /work/#{distro_id}-#{arch}"
           task.sh "cp #{RPM_SRPMS_DIR}/#{nginx_srpm_name(distro_id)} /work/#{distro_id}-#{arch}/"

diff --git a/internal/test/misc/config.json b/internal/test/misc/config.json
@@ -1,9 +1,9 @@
 {
   "normal_user_1": "games",
   "normal_user_2": "daemon",
-  "default_user": "gopher",
+  "default_user": "operator",
   "normal_group_1": "daemon",
-  "normal_group_2": "gopher",
+  "normal_group_2": "operator",
   "default_group": "games",
 
   "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",

diff --git a/internal/test/misc/test_support.rb b/internal/test/misc/test_support.rb
@@ -59,3 +59,10 @@ def eventually(deadline_duration = 10, check_interval = 0.05)
   end
   raise "Time limit exceeded"
 end
+
+def clear_bundler_env!
+  orig_env = Bundler.with_clean_env do
+    ENV.to_hash
+  end
+  ENV.replace(orig_env)
+end
diff --git a/internal/test/system_web_server_test.rb b/internal/test/system_web_server_test.rb
@@ -4,6 +4,8 @@
 
 include FileUtils
 
+clear_bundler_env!
+
 def create_app_dir(source, startup_file, dir_name)
   app_root = "/home/app/#{dir_name}"
   rm_rf(app_root)
@@ -23,11 +25,34 @@ def create_app_dirs
   app_dirs
 end
 
+def redhat_major_release
+  File.read("/etc/redhat-release") =~ /release ([0-9]+)/
+  $1.to_i
+end
+
 def start_stop_service(name, action)
-  if File.exist?("/sbin/service")
-    sh("service #{name} #{action}")
+  if redhat_major_release >= 7
+    if name == "httpd"
+      if action == "start"
+        sh(". /etc/sysconfig/httpd && /usr/sbin/httpd $OPTIONS")
+      elsif action == "stop"
+        sh("kill `cat /run/httpd/httpd.pid`")
+      else
+        raise "Don't know how to #{action} #{name}"
+      end
+    elsif name == "nginx"
+      if action == "start"
+        sh("/usr/sbin/nginx")
+      elsif action == "stop"
+        sh("kill -s QUIT `cat /run/nginx.pid`")
+      else
+        raise "Don't know how to #{action} #{name}"
+      end
+    else
+      raise "Don't know how to #{action} #{name}"
+    end
   else
-    sh("systemctl #{action} #{name}.service")
+    sh("service #{name} #{action}")
   end
 end
 

diff --git a/internal/test/test.sh b/internal/test/test.sh
@@ -55,8 +55,10 @@ else
 	run chmod 644 /etc/httpd/conf.d/apache-pre-24.conf
 fi
 run setuser app chmod 755 /home/app
-run setuser app mkdir -p /cache/test/bundle
-run setuser app rake test:install_deps DOCTOOLS=no DEPS_TARGET=/cache/test/bundle BUNDLE_ARGS="-j 4"
+run setuser app mkdir -p /cache/test-$DISTRIBUTION/bundle
+run setuser app mkdir -p /cache/test-$DISTRIBUTION/node_modules
+run setuser app ln -s /cache/test-$DISTRIBUTION/node_modules node_modules
+run setuser app rake test:install_deps DOCTOOLS=no DEPS_TARGET=/cache/test-$DISTRIBUTION/bundle BUNDLE_ARGS="-j 4"
 run setuser app cp /system/internal/test/misc/config.json test/config.json
 find /var/{log,lib}/nginx -type d | xargs --no-run-if-empty chmod o+rwx
 find /var/{log,lib}/nginx -type f | xargs --no-run-if-empty chmod o+rw