Merge branch '21535-multi-wf-delete'

[arvados.git] / build / package-testing / common-test-rails-server-package.sh

diff --git a/build/package-testing/common-test-rails-server-package.sh b/build/package-testing/common-test-rails-server-package.sh
index 93e32637ded0847e6651e2457bb99503c9e6b236..62b30c37d1f0963f0dccc4425c85c7e63a429a5e 100755 (executable)
--- a/build/package-testing/common-test-rails-server-package.sh
+++ b/build/package-testing/common-test-rails-server-package.sh
@@ -12,30 +12,6 @@ else
     PACKAGE_NAME=$1; shift
 fi
 
-if [ "$PACKAGE_NAME" = "arvados-workbench" ]; then
-  mkdir -p /etc/arvados
-  cat <<'EOF' >/etc/arvados/config.yml
----
-Clusters:
-  xxxxx:
-    Services:
-      Workbench1:
-        ExternalURL: "https://workbench.xxxxx.example.com"
-      WebDAV:
-        ExternalURL: https://*.collections.xxxxx.example.com/
-      WebDAVDownload:
-        ExternalURL: https://download.xxxxx.example.com
-    ManagementToken: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    SystemRootToken: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    Collections:
-      BlobSigningKey: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    Workbench:
-      SecretKeyBase: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    Users:
-      AutoAdminFirstUser: true
-EOF
-fi
-
 cd "/var/www/${PACKAGE_NAME%-server}/current"
 
 case "$TARGET" in
@@ -43,10 +19,6 @@ case "$TARGET" in
         apt-get install -y nginx
         dpkg-reconfigure "$PACKAGE_NAME"
         ;;
-    centos*)
-        yum install --assumeyes httpd
-        yum reinstall --assumeyes "$PACKAGE_NAME"
-        ;;
     rocky*)
         microdnf --assumeyes install httpd
         microdnf --assumeyes reinstall "$PACKAGE_NAME"
@@ -57,4 +29,4 @@ case "$TARGET" in
         ;;
 esac
 
-/usr/local/rvm/bin/rvm-exec default bundle list >"$ARV_PACKAGES_DIR/$PACKAGE_NAME.gems"
+bundle list >"$ARV_PACKAGES_DIR/$PACKAGE_NAME.gems"