Merge branch '21137-rp-initiated-logout'

[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 a60fcc465259ae89d0dc99fd114f179d8fffd6a7..d50bd50bb50e79678204947839c74e99f41f1781 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
@@ -48,8 +24,8 @@ case "$TARGET" in
         yum reinstall --assumeyes "$PACKAGE_NAME"
         ;;
     rocky*)
-        microdnf install httpd
-        microdnf reinstall "$PACKAGE_NAME"
+        microdnf --assumeyes install httpd
+        microdnf --assumeyes reinstall "$PACKAGE_NAME"
         ;;
     *)
         echo -e "$0: Unknown target '$TARGET'.\n" >&2