diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/prepare_build.sh | 25 | ||||
| -rwxr-xr-x | scripts/rails4-gemfile-lock-check | 19 | ||||
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 7 | ||||
| -rwxr-xr-x | scripts/trigger-build | 8 |
4 files changed, 23 insertions, 36 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 75a3cea0448..d85c53090a4 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -1,12 +1,11 @@ . scripts/utils.sh export SETUP_DB=${SETUP_DB:-true} -export CREATE_DB_USER=${CREATE_DB_USER:-$SETUP_DB} export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true} export BUNDLE_INSTALL_FLAGS="--without=production --jobs=$(nproc) --path=vendor --retry=3 --quiet" if [ "$USE_BUNDLE_INSTALL" != "false" ]; then - bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check + bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check fi # Only install knapsack after bundle install! Otherwise oddly some native @@ -23,18 +22,30 @@ export GITLAB_DATABASE=$(echo $CI_JOB_NAME | cut -f1 -d' ' | cut -f2 -d-) # This would make the default database postgresql, and we could also use # pg to mean postgresql. if [ "$GITLAB_DATABASE" != 'mysql' ]; then - export GITLAB_DATABASE='postgresql' + export GITLAB_DATABASE='postgresql' fi cp config/database.yml.$GITLAB_DATABASE config/database.yml +if [ -f config/database_geo.yml.$GITLAB_DATABASE ]; then + cp config/database_geo.yml.$GITLAB_DATABASE config/database_geo.yml +fi + # Set user to a non-superuser to ensure we test permissions sed -i 's/username: root/username: gitlab/g' config/database.yml if [ "$GITLAB_DATABASE" = 'postgresql' ]; then - sed -i 's/localhost/postgres/g' config/database.yml + sed -i 's/localhost/postgres/g' config/database.yml + + if [ -f config/database_geo.yml ]; then + sed -i 's/localhost/postgres/g' config/database_geo.yml + fi else # Assume it's mysql - sed -i 's/localhost/mysql/g' config/database.yml + sed -i 's/localhost/mysql/g' config/database.yml + + if [ -f config/database_geo.yml ]; then + sed -i 's/localhost/mysql/g' config/database_geo.yml + fi fi cp config/resque.yml.example config/resque.yml @@ -50,7 +61,7 @@ cp config/redis.shared_state.yml.example config/redis.shared_state.yml sed -i 's/localhost/redis/g' config/redis.shared_state.yml if [ "$SETUP_DB" != "false" ]; then - setup_db + setup_db elif getent hosts postgres || getent hosts mysql; then - setup_db_user_only + setup_db_user_only fi diff --git a/scripts/rails4-gemfile-lock-check b/scripts/rails4-gemfile-lock-check deleted file mode 100755 index a74a49874e1..00000000000 --- a/scripts/rails4-gemfile-lock-check +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -echo -e "=> Checking if Gemfile.rails4.lock is up-to-date...\\n" - -cp Gemfile.rails4.lock Gemfile.rails4.lock.orig -BUNDLE_GEMFILE=Gemfile.rails4 bundle install "$BUNDLE_INSTALL_FLAGS" -diff -u Gemfile.rails4.lock.orig Gemfile.rails4.lock >/dev/null 2>&1 - -if [ $? == 1 ] -then - diff -u Gemfile.rails4.lock.orig Gemfile.rails4.lock - - echo -e "\\nā ERROR: Gemfile.rails4.lock is not up-to-date! - Please run 'BUNDLE_GEMFILE=Gemfile.rails4 bundle install'\\n" >&2 - exit 1 -fi - -echo "ā Gemfile.rails4.lock is up-to-date" -exit 0 diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index b50bf2161cb..9e52366f800 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -227,7 +227,8 @@ function install_external_dns() { --set aws.zoneType="public" \ --set domainFilters[0]="${domain}" \ --set txtOwnerId="${KUBE_NAMESPACE}" \ - --set rbac.create="true" + --set rbac.create="true" \ + --set policy="sync" fi } @@ -292,7 +293,7 @@ function get_job_id() { local job_id=$(curl --silent --show-error --header "PRIVATE-TOKEN: ${API_TOKEN}" "${url}" | jq "map(select(.name == \"${job_name}\")) | map(.id) | last") [[ "${job_id}" == "null" && "${page}" -lt "$max_page" ]] || break - ((page++)) + let "page++" done if [[ "${job_id}" == "" ]]; then @@ -334,7 +335,7 @@ function wait_for_job_to_be_done() { [[ "${job_status}" == "pending" || "${job_status}" == "running" ]] || break printf "." - ((elapsed_seconds+=$interval)) + let "elapsed_seconds+=interval" sleep ${interval} done diff --git a/scripts/trigger-build b/scripts/trigger-build index 14af3281106..4032ba853e6 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -68,7 +68,7 @@ module Trigger def base_variables { - 'GITLAB_REF_SLUG' => ref_slug, + 'GITLAB_REF_SLUG' => ENV['CI_COMMIT_REF_SLUG'], 'TRIGGERED_USER' => ENV['TRIGGERED_USER'] || ENV['GITLAB_USER_NAME'], 'TRIGGER_SOURCE' => ENV['CI_JOB_URL'], 'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'], @@ -77,12 +77,6 @@ module Trigger } end - def ref_slug - return 'master' if ENV['CI_COMMIT_REF_SLUG'] =~ %r{(\Aqa[/-]|-qa\z)} - - ENV['CI_COMMIT_REF_SLUG'] - end - # Read version files from all components def version_file_variables Dir.glob("*_VERSION").each_with_object({}) do |version_file, params| |