From f6eb1f2b73bef0fa2f2d5e909ecc4bc64fc1e0b6 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 27 Oct 2020 11:24:23 -0400 Subject: [PATCH] build: Remove remaining references to the SSO server packages. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- build/README | 4 +- build/rails-package-scripts/README.md | 4 +- .../arvados-sso-server.sh | 13 -- build/rails-package-scripts/postinst.sh | 7 +- build/run-build-packages-sso.sh | 158 ------------------ build/run-library.sh | 4 +- 6 files changed, 5 insertions(+), 185 deletions(-) delete mode 100644 build/rails-package-scripts/arvados-sso-server.sh delete mode 100755 build/run-build-packages-sso.sh diff --git a/build/README b/build/README index 4c67839a10..54d5ea404c 100644 --- a/build/README +++ b/build/README @@ -16,8 +16,6 @@ run-build-packages.sh Actually build packages. Intended to r inside Docker container with proper build environment. -run-build-packages-sso.sh Build single-sign-on server packages. - run-build-packages-python-and-ruby.sh Build Python and Ruby packages suitable for upload to PyPi and Rubygems. @@ -31,4 +29,4 @@ build-dev-docker-jobs-image.sh Build developer arvados/jobs Docker ima run-library.sh A library of functions shared by the various scripts in this - directory. \ No newline at end of file + directory. diff --git a/build/rails-package-scripts/README.md b/build/rails-package-scripts/README.md index 2930957b94..35549d9cd3 100644 --- a/build/rails-package-scripts/README.md +++ b/build/rails-package-scripts/README.md @@ -14,5 +14,5 @@ postinst.sh lets the early parts define a few hooks to control behavior: * After it installs the core configuration files (database.yml, application.yml, and production.rb) to /etc/arvados/server, it calls setup_extra_conffiles. By default this is a noop function (in step2.sh). * Before it restarts nginx, it calls setup_before_nginx_restart. By default this is a noop function (in step2.sh). API server defines this to set up the internal git repository, if necessary. -* $RAILSPKG_DATABASE_LOAD_TASK defines the Rake task to load the database. API server uses db:structure:load. SSO server uses db:schema:load. Workbench doesn't set this, which causes the postinst to skip all database work. -* If $RAILSPKG_SUPPORTS_CONFIG_CHECK != 1, it won't run the config:check rake task. SSO clears this flag (it doesn't have that task code). +* $RAILSPKG_DATABASE_LOAD_TASK defines the Rake task to load the database. API server uses db:structure:load. Workbench doesn't set this, which causes the postinst to skip all database work. +* If $RAILSPKG_SUPPORTS_CONFIG_CHECK != 1, it won't run the config:check rake task. diff --git a/build/rails-package-scripts/arvados-sso-server.sh b/build/rails-package-scripts/arvados-sso-server.sh deleted file mode 100644 index e88da0d3a6..0000000000 --- a/build/rails-package-scripts/arvados-sso-server.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# Copyright (C) The Arvados Authors. All rights reserved. -# -# SPDX-License-Identifier: AGPL-3.0 - -# This file declares variables common to all scripts for one Rails package. - -PACKAGE_NAME=arvados-sso-server -INSTALL_PATH=/var/www/arvados-sso -CONFIG_PATH=/etc/arvados/sso -DOC_URL="https://doc.arvados.org/v2.0/install/install-sso.html#configure" -RAILSPKG_DATABASE_LOAD_TASK=db:schema:load -RAILSPKG_SUPPORTS_CONFIG_CHECK=0 diff --git a/build/rails-package-scripts/postinst.sh b/build/rails-package-scripts/postinst.sh index 357c100643..3eb2d2c5e0 100644 --- a/build/rails-package-scripts/postinst.sh +++ b/build/rails-package-scripts/postinst.sh @@ -256,9 +256,4 @@ elif [ "$1" = "0" ] || [ "$1" = "1" ] || [ "$1" = "2" ]; then configure_version fi -if printf '%s\n' "$CONFIG_PATH" | grep -Fqe "sso"; then - report_not_ready "$APPLICATION_READY" "$CONFIG_PATH/application.yml" - report_not_ready "$DATABASE_READY" "$CONFIG_PATH/database.yml" -else - report_not_ready "$APPLICATION_READY" "/etc/arvados/config.yml" -fi +report_not_ready "$APPLICATION_READY" "/etc/arvados/config.yml" diff --git a/build/run-build-packages-sso.sh b/build/run-build-packages-sso.sh deleted file mode 100755 index d8d9b984a0..0000000000 --- a/build/run-build-packages-sso.sh +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/bash -# Copyright (C) The Arvados Authors. All rights reserved. -# -# SPDX-License-Identifier: AGPL-3.0 - -JENKINS_DIR=$(dirname $(readlink -e "$0")) -. "$JENKINS_DIR/run-library.sh" - -read -rd "\000" helpmessage <&2 "$helpmessage" - echo >&2 - exit 1 - ;; - --target) - TARGET="$2"; shift - ;; - --debug) - DEBUG=1 - ;; - --test-packages) - test_packages=1 - ;; - --) - if [ $# -gt 1 ]; then - echo >&2 "$0: unrecognized argument '$2'. Try: $0 --help" - exit 1 - fi - ;; - esac - shift -done - -STDOUT_IF_DEBUG=/dev/null -STDERR_IF_DEBUG=/dev/null -DASHQ_UNLESS_DEBUG=-q -if [[ "$DEBUG" != 0 ]]; then - STDOUT_IF_DEBUG=/dev/stdout - STDERR_IF_DEBUG=/dev/stderr - DASHQ_UNLESS_DEBUG= -fi - -case "$TARGET" in - debian*) - FORMAT=deb - ;; - ubuntu*) - FORMAT=deb - ;; - centos*) - FORMAT=rpm - ;; - *) - echo -e "$0: Unknown target '$TARGET'.\n" >&2 - exit 1 - ;; -esac - -if ! [[ -n "$WORKSPACE" ]]; then - echo >&2 "$helpmessage" - echo >&2 - echo >&2 "Error: WORKSPACE environment variable not set" - echo >&2 - exit 1 -fi - -if ! [[ -d "$WORKSPACE" ]]; then - echo >&2 "$helpmessage" - echo >&2 - echo >&2 "Error: $WORKSPACE is not a directory" - echo >&2 - exit 1 -fi - -# Test for fpm -fpm --version >/dev/null 2>&1 - -if [[ "$?" != 0 ]]; then - echo >&2 "$helpmessage" - echo >&2 - echo >&2 "Error: fpm not found" - echo >&2 - exit 1 -fi - -RUN_BUILD_PACKAGES_PATH="`dirname \"$0\"`" -RUN_BUILD_PACKAGES_PATH="`( cd \"$RUN_BUILD_PACKAGES_PATH\" && pwd )`" # absolutized and normalized -if [ -z "$RUN_BUILD_PACKAGES_PATH" ] ; then - # error; for some reason, the path is not accessible - # to the script (e.g. permissions re-evaled after suid) - exit 1 # fail -fi - -debug_echo "$0 is running from $RUN_BUILD_PACKAGES_PATH" -debug_echo "Workspace is $WORKSPACE" - -if [[ -f /etc/profile.d/rvm.sh ]]; then - source /etc/profile.d/rvm.sh - GEM="rvm-exec default gem" -else - GEM=gem -fi - -# Make all files world-readable -- jenkins runs with umask 027, and has checked -# out our git tree here -chmod o+r "$WORKSPACE" -R - -# More cleanup - make sure all executables that we'll package are 755 -# No executables in the sso server package -#find -type d -name 'bin' |xargs -I {} find {} -type f |xargs -I {} chmod 755 {} - -# Now fix our umask to something better suited to building and publishing -# gems and packages -umask 0022 - -debug_echo "umask is" `umask` - -if [[ ! -d "$WORKSPACE/packages/$TARGET" ]]; then - mkdir -p "$WORKSPACE/packages/$TARGET" -fi - -# Build the SSO server package -handle_rails_package arvados-sso-server "$WORKSPACE" \ - "$WORKSPACE/LICENCE" --url="https://arvados.org" \ - --description="Arvados SSO server - Arvados is a free and open source platform for big data science." \ - --license="Expat license" - -exit $EXITCODE diff --git a/build/run-library.sh b/build/run-library.sh index 4c730c655d..a16535654f 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -431,9 +431,7 @@ handle_rails_package() { fi # For some reason fpm excludes need to not start with /. local exclude_root="${railsdir#/}" - # .git and packages are for the SSO server, which is built from its - # repository root. - local -a exclude_list=(.git packages tmp log coverage Capfile\* \ + local -a exclude_list=(tmp log coverage Capfile\* \ config/deploy\* config/application.yml) # for arvados-workbench, we need to have the (dummy) config/database.yml in the package if [[ "$pkgname" != "arvados-workbench" ]]; then -- 2.30.2