diff options
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | .gitlab/test.yml | 38 |
2 files changed, 34 insertions, 20 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abfdb55..41f3e61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,18 +12,24 @@ include: - local: .gitlab/test.yml - local: .gitlab/release.yml -services: - - docker:stable-dind - stages: - build - test - tag - release +default: + image: + name: $TMP_IMAGE + entrypoint: [""] + tags: [gitlab-org] + build commit: image: docker:stable stage: build + tags: [gitlab-org-docker] + services: + - docker:stable-dind script: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY @@ -39,6 +45,9 @@ container_scanning: .docker_tag: image: docker:stable stage: tag + tags: [gitlab-org-docker] + services: + - docker:stable-dind script: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY @@ -87,4 +96,3 @@ code_quality: license_scanning: image: name: $TMP_IMAGE - entrypoint: [''] diff --git a/.gitlab/test.yml b/.gitlab/test.yml index 22147eb..5059269 100644 --- a/.gitlab/test.yml +++ b/.gitlab/test.yml @@ -2,7 +2,12 @@ size: image: docker:stable stage: test allow_failure: true # temporary until we can shrink the image size. + services: + - docker:stable-dind + tags: [gitlab-org-docker] timeout: 3 minutes + variables: + GIT_STRATEGY: none script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker pull $TMP_IMAGE @@ -20,57 +25,58 @@ lint: .rspec: stage: test script: - - ./bin/test $RSPEC_DIR --format RspecJunitFormatter --out rspec.xml + - bash -lc './bin/test $RSPEC_DIR --format RspecJunitFormatter --out rspec.xml' + variables: + BUNDLE_JOBS: '2' + BUNDLE_PATH: 'vendor/bundle' + GIT_DEPTH: "10" + GIT_STRATEGY: fetch + cache: + key: ${CI_COMMIT_REF_SLUG} + paths: + - vendor/bundle artifacts: paths: - rspec.xml reports: junit: rspec.xml -.integration: - extends: .rspec - image: - name: $TMP_IMAGE - entrypoint: [""] - script: - - bash -lc './bin/test $RSPEC_DIR --format RspecJunitFormatter --out rspec.xml' - unit: extends: .rspec variables: RSPEC_DIR: spec/unit integration-dotnet: - extends: .integration + extends: .rspec variables: RSPEC_DIR: spec/integration/dotnet integration-go: - extends: .integration + extends: .rspec variables: RSPEC_DIR: spec/integration/go integration-java: - extends: .integration + extends: .rspec variables: RSPEC_DIR: spec/integration/java integration-js: - extends: .integration + extends: .rspec variables: RSPEC_DIR: spec/integration/js integration-php: - extends: .integration + extends: .rspec variables: RSPEC_DIR: spec/integration/php integration-python: - extends: .integration + extends: .rspec variables: RSPEC_DIR: spec/integration/python integration-ruby: - extends: .integration + extends: .rspec variables: RSPEC_DIR: spec/integration/ruby |