summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-01-09 11:26:40 +0000
committerCan Eldem <celdem@gitlab.com>2020-01-09 11:26:40 +0000
commitf16af48f9b7cf99e8d1cdb1e44dad9aad3a090b6 (patch)
tree3944b2eade680f90739f2f3805dfec1a7bb1a360 /.gitlab-ci.yml
parentd51e4d90b3e7dbfc5b0a9ec90f37baf84dc105d0 (diff)
parentd89872f850332736eb174f2b0ab28692fda6bf46 (diff)
Merge branch '35629-upgrade-python' into 'master'v2.3.0
Upgrade python from 3.5 to 3.8 See merge request gitlab-org/security-products/license-management!101
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml19
1 files changed, 18 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8347a2a..02c188c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,12 +48,29 @@ container_scanning:
- results/
when: always
+size:
+ image: docker:stable
+ stage: test
+ allow_failure: true # temporary until we can shrink the image size.
+ timeout: 1 minute
+ script:
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+ - docker pull $TMP_IMAGE
+
unit:
stage: test
script:
- gem install bundler -v '~> 2.0'
- bundle install
- - bundle exec rspec
+ - bundle exec rspec spec/unit
+
+integration:
+ image:
+ name: $TMP_IMAGE
+ entrypoint: [""]
+ stage: test
+ script:
+ - bash -lc "cd $LM_HOME && bundle install && bundle exec rspec spec/integration"
QA:php-composer:
extends: .QA