diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-07-10 16:41:15 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-07-10 16:41:15 +0000 |
| commit | c17546f6cfccf07d27f7984321fe62a7788e8da1 (patch) | |
| tree | 54093c956c0f4dcf4c2ad352847017aee9a88edc /.gitlab | |
| parent | c7385965b4166fb6ab2db3387c67cd54aef1b8df (diff) | |
| parent | 36cdb0040abda394264455a1fdf3d6782af95ceb (diff) | |
Merge branch '217897-isolated-omnibus-lm' into 'master'v3.17.0
Isolate license_management ruby from project ruby
See merge request gitlab-org/security-products/license-management!181
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/build.yml | 5 | ||||
| -rw-r--r-- | .gitlab/test.yml | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/.gitlab/build.yml b/.gitlab/build.yml index a7c2dab..17005c2 100644 --- a/.gitlab/build.yml +++ b/.gitlab/build.yml @@ -22,11 +22,8 @@ build-docker-image: services: - docker:stable-dind script: - - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker pull $LATEST_IMAGE || true - - docker build --cache-from $LATEST_IMAGE -t $TMP_IMAGE . - - docker image inspect $TMP_IMAGE --format='{{.Size}}' + - IMAGE_NAME="$TMP_IMAGE" bin/docker-build - docker push $TMP_IMAGE build-mvn-pkg: diff --git a/.gitlab/test.yml b/.gitlab/test.yml index 506f344..00c9434 100644 --- a/.gitlab/test.yml +++ b/.gitlab/test.yml @@ -22,7 +22,7 @@ lint: stage: test image: ruby:alpine script: - - apk add build-base shellcheck + - apk add bash build-base git shellcheck - bin/setup - bin/lint needs: [] @@ -30,17 +30,16 @@ lint: .rspec: stage: test script: - - bash -lc './bin/test $RSPEC_DIR --format RspecJunitFormatter --out rspec.xml' + - ./bin/setup + - ./bin/test $RSPEC_DIR --format RspecJunitFormatter --out rspec.xml variables: - BUNDLE_JOBS: '2' - BUNDLE_PATH: 'vendor/bundle' GIT_DEPTH: "10" GIT_STRATEGY: fetch LOG_LEVEL: debug cache: key: ${CI_COMMIT_REF_SLUG} paths: - - vendor/bundle + - vendor artifacts: paths: - coverage/coverage.xml |