Skip to content
Snippets Groups Projects

Configure everything if GITLAB_URL is set

Closed Balasankar C requested to merge 2619-gitlab-configure-env-variable into master
All threads resolved!

Closes #2619 (closed)

ToDO

  • Move ASCII art and information printing to the upgrade task from postinst.
Edited by Balasankar C

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Balasankar C changed the description

    changed the description

  • Balasankar C marked the checklist item Move ASCII art and information printing to the upgrade task from postinst. as completed

    marked the checklist item Move ASCII art and information printing to the upgrade task from postinst. as completed

  • With moving print statement to the upgrade script, we need to test certain things

    1. GITLAB_URL takes precedence if provided. Else, check for FQDN (Also do the EC2 check).
    2. Welcome message ("GitLab is available at blahblah") gets printed only at the end during
    3. Installation without providing GITLAB_URL
    4. Installation with providing GITLAB_URL
    5. Upgrade with PG upgrade involved
    6. Upgrade without PG upgrade involved
    7. It doesn't gets printed (and give false hope) if something fails during install/upgrade.
  • @marin A review would be great (still WIP until I test all the cases above).

  • Marin Jankovski
  • Marin Jankovski
  • Marin Jankovski
  • Balasankar C added 41 commits

    added 41 commits

    • 5815a2e4...0e641ebb - 32 commits from branch master
    • 49bf20ed - Configure everything if GITLAB_URL is set
    • 854ec0cd - Make Rubocop happy
    • 7920c4f6 - Move asciiart to upgrade script
    • 87464125 - Cleanup code
    • 11980aa9 - Pass external url to upgrade script
    • 6e030176 - Improve informational message
    • 08b01e58 - Set TERM variable before installing GitLab in Docker container
    • a00ca845 - Use different message for upgrades. Also clean up color after printing logo
    • 39251a6d - Revert "Set TERM variable before installing GitLab in Docker container"

    Compare with previous version

  • Balasankar C added 1 commit

    added 1 commit

    Compare with previous version

  • Balasankar C resolved all discussions

    resolved all discussions

  • @marin Assigning to you for another round of review. I will be testing those scenarios mentioned in https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1839#note_37181437 tomorrow.

  • assigned to @marin

  • Balasankar C added 1 commit

    added 1 commit

    Compare with previous version

    • Upgrade from 8.x (Involving PG upgrade) - Upgrade complete message displayed correctly at the end
    • Upgrade from 9.4.x (No PG upgrade) - Upgrade complete message displayed correctly at the end
    • Installation with GITLAB_URL - Show welcome message pointing to GITLAB_URL at the end
    • Installation without GITLAB_URL
      • With hostname - Detects fqdn from hostname and displays welcome message pointing to GITLAB_URL at the end
      • Without hostname - Shows welcome message with "unable to detect url" note at the end
  • I am too tempted to put a box around the info message so it is more visible. #2533 will probably supersede it, but still. Something like

    ###############################################################################
    GitLab was unable to detect a valid hostname for your instance.
    Please configure a URL for your GitLab instance by setting `external_url`
    configuration in /etc/gitlab/gitlab.rb file.
    Then, you can start your GitLab instance by running the following command:
      sudo gitlab-ctl reconfigure
    ###############################################################################
    
    For a comprehensive list of configuration options please see the Omnibus GitLab readme
    https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md

    or

    ###############################################################################
    Upgrade complete! If your GitLab server is misbehaving try running
    
       sudo gitlab-ctl restart
    
    before anything else. If you need to roll back to the previous version you can
    use the database backup made during the upgrade (scroll up for the filename).
    ###############################################################################
  • Balasankar C unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Balasankar C added 1 commit

    added 1 commit

    • 66740278 - Prevent auto-reconfigure from happening in docker builds

    Compare with previous version

  • Balasankar C added 1 commit

    added 1 commit

    • 5f7c5d97 - Make info message more visible

    Compare with previous version

  • @marin I tested the scenarios mentioned in https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1839#note_37181437 and they turned out to be fine. I believe the MR is ready for review/merge.

  • Marin Jankovski
  • Marin Jankovski
  • Marin Jankovski
  • Marin Jankovski
  • Marin Jankovski
  • Balasankar C added 1 commit

    added 1 commit

    Compare with previous version

  • Balasankar C added 1 commit

    added 1 commit

    • 6dd6a775 - Drop usage of hostname for detecting fqdn

    Compare with previous version

  • Balasankar C added 1 commit

    added 1 commit

    • d0f30ef2 - Use EXTERNAL_URL as flag variable

    Compare with previous version

  • assigned to @marin

  • Balasankar C resolved all discussions

    resolved all discussions

  • Balasankar C added 1 commit

    added 1 commit

    • 6aee6d98 - Reset color after tanuki_art also

    Compare with previous version

  • Balasankar C added 1 commit

    added 1 commit

    Compare with previous version

  • Marin Jankovski approved this merge request

    approved this merge request

  • Marin Jankovski enabled an automatic merge when the pipeline for 6639f63e succeeds

    enabled an automatic merge when the pipeline for 6639f63e succeeds

  • Merged manually, MRs are not updating atm.

  • closed

  • mentioned in issue #2619 (closed)

  • Please register or sign in to reply
    Loading