diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8866dde9f..cad82dff0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,8 @@ variables: DOCKER_DRIVER: overlay2 DOCKER_HOST: tcp://docker:2375 services: - - docker:20.10.2-dind + - name: docker:20.10.2-dind + alias: localhost tags: - gitlab-org-docker diff --git a/files/gitlab-cookbooks/letsencrypt/attributes/default.rb b/files/gitlab-cookbooks/letsencrypt/attributes/default.rb index f654fccdc..75c7b2c72 100644 --- a/files/gitlab-cookbooks/letsencrypt/attributes/default.rb +++ b/files/gitlab-cookbooks/letsencrypt/attributes/default.rb @@ -13,3 +13,5 @@ default['letsencrypt']['group'] = nil default['letsencrypt']['key_size'] = nil default['letsencrypt']['owner'] = nil default['letsencrypt']['wwwroot'] = '/var/opt/gitlab/nginx/www' +default['letsencrypt']['acme_staging_endpoint'] = 'https://acme-staging-v02.api.letsencrypt.org/directory' +default['letsencrypt']['acme_production_endpoint'] = 'https://acme-v02.api.letsencrypt.org/directory' diff --git a/files/gitlab-cookbooks/letsencrypt/recipes/http_authorization.rb b/files/gitlab-cookbooks/letsencrypt/recipes/http_authorization.rb index bf8b32c69..097fd771b 100644 --- a/files/gitlab-cookbooks/letsencrypt/recipes/http_authorization.rb +++ b/files/gitlab-cookbooks/letsencrypt/recipes/http_authorization.rb @@ -2,6 +2,7 @@ site = URI(node['gitlab']['external-url']).host omnibus_helper = OmnibusHelper.new(node) +# ../resources/certificate.rb letsencrypt_certificate site do crt node['gitlab']['nginx']['ssl_certificate'] key node['gitlab']['nginx']['ssl_certificate_key'] diff --git a/files/gitlab-cookbooks/letsencrypt/resources/certificate.rb b/files/gitlab-cookbooks/letsencrypt/resources/certificate.rb index a63725e12..d24037d29 100644 --- a/files/gitlab-cookbooks/letsencrypt/resources/certificate.rb +++ b/files/gitlab-cookbooks/letsencrypt/resources/certificate.rb @@ -6,7 +6,8 @@ property :alt_names, Array, default: lazy { node['letsencrypt']['alt_names'] } property :key_size, [Integer, nil], default: lazy { node['letsencrypt']['key_size'] } property :crt, [String, nil], default: lazy { node['letsencrypt']['crt'] } property :group, [String, nil], default: lazy { node['letsencrypt']['group'] } - +property :acme_staging_endpoint, [String, nil], default: lazy { node['letsencrypt']['acme_staging_endpoint'] } +property :acme_production_endpoint, [String, nil], default: lazy { node['letsencrypt']['acme_production_endpoint'] } property :chain, [String, nil], deprecated: 'chain has been deprecated since crt now returns the full certificate by default', default: lazy { node['letsencrypt']['chain'] } @@ -32,7 +33,7 @@ action :create do crt "#{new_resource.crt}-staging" cn new_resource.cn key "#{new_resource.key}-staging" - dir 'https://acme-staging-v02.api.letsencrypt.org/directory' + dir new_resource.acme_staging_endpoint wwwroot new_resource.wwwroot sensitive true end @@ -53,6 +54,7 @@ action :create do crt new_resource.crt cn new_resource.cn key new_resource.key + dir new_resource.acme_production_endpoint wwwroot new_resource.wwwroot notifies :run, 'execute[reload nginx]' sensitive true diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml index c12de6657..bcb33e7ba 100644 --- a/gitlab-ci-config/gitlab-com.yml +++ b/gitlab-ci-config/gitlab-com.yml @@ -454,6 +454,18 @@ Trigger:qa-test: <<: *com-trigger-only dependencies: [] +Trigger:letsencrypt-test: + extends: .docker_job + stage: trigger-qa + script: + - if [ -n "$TRIGGERED_USER" ] && [ -n "$TRIGGER_SOURCE" ]; then echo "Pipeline triggered by $TRIGGERED_USER at $TRIGGER_SOURCE"; fi + - echo "${CI_REGISTRY_PASSWORD}" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY + - curl -L "https://github.com/docker/compose/releases/download/1.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + - chmod +x /usr/local/bin/docker-compose + - bundle exec rake qa:test_letsencrypt + <<: *com-trigger-only + dependencies: [] + Trigger:ha-validate: stage: trigger-qa image: "${RUBY_IMAGE}" diff --git a/letsencrypt-test/docker-compose.yml b/letsencrypt-test/docker-compose.yml new file mode 100644 index 000000000..f2cd67564 --- /dev/null +++ b/letsencrypt-test/docker-compose.yml @@ -0,0 +1,58 @@ +version: '3' +services: + gitlab: + image: ${IMAGE} + hostname: gitlab.example.com + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'https://gitlab.example.com' + letsencrypt['acme_staging_endpoint'] = 'https://pebble:14000/dir' + letsencrypt['acme_production_endpoint'] = 'https://pebble:14000/dir' + GITLAB_POST_RECONFIGURE_SCRIPT: ${GITLAB_POST_RECONFIGURE_SCRIPT} + volumes: + - type: bind + source: ./pebble-data/pebble.minica.pem # https://github.com/letsencrypt/pebble/blob/master/test/certs/pebble.minica.pem + target: /etc/gitlab/trusted-certs/pebble.minica.pem + ports: + - 8080:80 + - 8443:443 + networks: + acmenet: + ipv4_address: 10.30.50.10 + + pebble: + image: letsencrypt/pebble:v2.3.1 # https://hub.docker.com/r/letsencrypt/pebble + hostname: pebble + command: pebble -config /test/config/pebble-config.json -strict false -dnsserver 10.30.50.3:8053 + environment: + # TODO(@cpu): Delete this explicit GODEBUG env var once Pebble is built with Go 1.13.x which defaults TLS 1.3 to on + GODEBUG: "tls13=1" + PEBBLE_VA_NOSLEEP: '1' # https://github.com/letsencrypt/pebble#testing-at-full-speed + PEBBLE_WFE_NONCEREJECT: '0' # https://github.com/letsencrypt/pebble#invalid-anti-replay-nonce-errors + volumes: + - type: bind + source: ./pebble-config.json + target: /test/config/pebble-config.json + ports: + - 14000:14000 # HTTPS ACME API + - 15000:15000 # HTTPS Management API + networks: + acmenet: + ipv4_address: 10.30.50.2 + + challtestsrv: # https://github.com/letsencrypt/pebble/tree/master/cmd/pebble-challtestsrv + image: letsencrypt/pebble-challtestsrv:v2.3.1 # https://hub.docker.com/r/letsencrypt/pebble-challtestsrv + command: pebble-challtestsrv -http01 ":80" + ports: + - 8055:8055 # HTTP Management API + networks: + acmenet: + ipv4_address: 10.30.50.3 + +networks: + acmenet: + driver: bridge + ipam: + driver: default + config: + - subnet: 10.30.50.0/24 diff --git a/letsencrypt-test/pebble-config.json b/letsencrypt-test/pebble-config.json new file mode 100644 index 000000000..7bfa827a1 --- /dev/null +++ b/letsencrypt-test/pebble-config.json @@ -0,0 +1,12 @@ +{ + "pebble": { + "listenAddress": "0.0.0.0:14000", + "managementListenAddress": "0.0.0.0:15000", + "certificate": "test/certs/localhost/cert.pem", + "privateKey": "test/certs/localhost/key.pem", + "httpPort": 80, + "tlsPort": 5001, + "ocspResponderURL": "", + "externalAccountBindingRequired": false + } +} diff --git a/letsencrypt-test/pebble-data/LICENSE b/letsencrypt-test/pebble-data/LICENSE new file mode 100644 index 000000000..a612ad981 --- /dev/null +++ b/letsencrypt-test/pebble-data/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/letsencrypt-test/pebble-data/pebble.minica.pem b/letsencrypt-test/pebble-data/pebble.minica.pem new file mode 100644 index 000000000..a69a4c419 --- /dev/null +++ b/letsencrypt-test/pebble-data/pebble.minica.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDCTCCAfGgAwIBAgIIJOLbes8sTr4wDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE +AxMVbWluaWNhIHJvb3QgY2EgMjRlMmRiMCAXDTE3MTIwNjE5NDIxMFoYDzIxMTcx +MjA2MTk0MjEwWjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSAyNGUyZGIwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5WgZNoVJandj43kkLyU50vzCZ +alozvdRo3OFiKoDtmqKPNWRNO2hC9AUNxTDJco51Yc42u/WV3fPbbhSznTiOOVtn +Ajm6iq4I5nZYltGGZetGDOQWr78y2gWY+SG078MuOO2hyDIiKtVc3xiXYA+8Hluu +9F8KbqSS1h55yxZ9b87eKR+B0zu2ahzBCIHKmKWgc6N13l7aDxxY3D6uq8gtJRU0 +toumyLbdzGcupVvjbjDP11nl07RESDWBLG1/g3ktJvqIa4BWgU2HMh4rND6y8OD3 +Hy3H8MY6CElL+MOCbFJjWqhtOxeFyZZV9q3kYnk9CAuQJKMEGuN4GU6tzhW1AgMB +AAGjRTBDMA4GA1UdDwEB/wQEAwIChDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB +BQUHAwIwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0BAQsFAAOCAQEAF85v +d40HK1ouDAtWeO1PbnWfGEmC5Xa478s9ddOd9Clvp2McYzNlAFfM7kdcj6xeiNhF +WPIfaGAi/QdURSL/6C1KsVDqlFBlTs9zYfh2g0UXGvJtj1maeih7zxFLvet+fqll +xseM4P9EVJaQxwuK/F78YBt0tCNfivC6JNZMgxKF59h0FBpH70ytUSHXdz7FKwix +Mfn3qEb9BXSk0Q3prNV5sOV3vgjEtB4THfDxSz9z3+DepVnW3vbbqwEbkXdk3j82 +2muVldgOUgTwK8eT+XdofVdntzU/kzygSAtAQwLJfn51fS1GvEcYGBc1bDryIqmF +p9BI7gVKtWSZYegicA== +-----END CERTIFICATE----- diff --git a/letsencrypt-test/test.sh b/letsencrypt-test/test.sh new file mode 100755 index 000000000..8f7c67950 --- /dev/null +++ b/letsencrypt-test/test.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +set -e + +DEFAULT_IMAGE='registry.gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/gitlab-ee:13.11.1-rfbranch.292570582.ad959b35-0' # TODO change this to EE latest before merge +IMAGE="${IMAGE:-$DEFAULT_IMAGE}" + +CLEANUP="${CLEANUP:-1}" +GITLAB_POST_RECONFIGURE_SCRIPT="${GITLAB_POST_RECONFIGURE_SCRIPT-'exit'}" # set to '' to disable + +cleanup() { + local exitcode=$? + + [ "$CLEANUP" != "1" ] && { echo 'skipping cleanup'; exit $exitcode; } + + echo "exit code: $exitcode, running cleanup" + docker-compose down + exit $exitcode +} +trap cleanup EXIT + + +main() { + export_vars + start_pebble + run_gitlab +} + + +export_vars() { + export IMAGE + export GITLAB_POST_RECONFIGURE_SCRIPT +} + + +start_pebble() { + docker-compose up -d pebble challtestsrv + curl -X POST -d '{"host":"gitlab.example.com", "addresses":["10.30.50.10"]}' \ + http://localhost:8055/add-a +} + + +run_gitlab() { + docker-compose run --rm -T --service-ports gitlab +} + + +main diff --git a/lib/gitlab/tasks/qa.rake b/lib/gitlab/tasks/qa.rake index 147ce49ad..351473e6f 100644 --- a/lib/gitlab/tasks/qa.rake +++ b/lib/gitlab/tasks/qa.rake @@ -80,6 +80,17 @@ namespace :qa do end end + desc "Run QA letsencrypt tests" + task :test_letsencrypt do + Gitlab::Util.section('qa:test_letsencrypt') do + Gitlab::Util.set_env_if_missing('CI_REGISTRY_IMAGE', 'registry.gitlab.com/gitlab-org/build/omnibus-gitlab-mirror') + image_address = Build::GitlabImage.gitlab_registry_image_address(tag: Build::Info.docker_tag) + Dir.chdir('letsencrypt-test') do + system({ 'IMAGE' => image_address }, './test.sh') + end + end + end + namespace :ha do desc "Validate HA setup" task :validate do