diff options
| author | Lucas Charles <me@lucascharles.me> | 2019-03-12 13:15:11 -0700 |
|---|---|---|
| committer | Lucas Charles <me@lucascharles.me> | 2019-03-12 13:15:38 -0700 |
| commit | df743fc2db74366ea0a7c15784338a4eecb496de (patch) | |
| tree | 655f7931c54c8f05b8d789854defa51112ce0bff | |
| parent | e8c3b0edfa784e37cbf44c0ad6ad8ea906af3f3a (diff) | |
isolate CS jobisolate-cs-job
| -rw-r--r-- | .gitlab-ci.yml | 55 |
1 files changed, 1 insertions, 54 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be21d2e..152acfe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,21 +23,6 @@ build commit: - docker build -t $TMP_IMAGE . - docker push $TMP_IMAGE -code_quality: - image: docker:stable - stage: test - allow_failure: true - script: - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SOURCE_CODE="$PWD" - --volume "$PWD":/code - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code - artifacts: - reports: - codequality: gl-code-quality-report.json - container_scanning: image: docker:stable stage: test @@ -59,38 +44,9 @@ container_scanning: artifacts: reports: container_scanning: gl-container-scanning-report.json - -.QA: - image: docker:stable - stage: test - script: - - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker pull $TMP_IMAGE - - mkdir results - - docker run --volume `pwd`/results:/results $TMP_IMAGE test $QA_PROJECT $QA_REF - artifacts: paths: - - results/ - when: always - -QA:java-maven: - extends: .QA - variables: - QA_PROJECT: java-maven - QA_REF: ccec8318 - -QA:python-pip: - extends: .QA - variables: - QA_PROJECT: python-pip - QA_REF: 04dce91b + - gl-container-scanning-report.json -QA:ruby-bundler: - extends: .QA - variables: - QA_PROJECT: ruby-bundler - QA_REF: 6b858821 .docker_tag: image: docker:stable @@ -104,15 +60,6 @@ QA:ruby-bundler: - docker tag $SOURCE_IMAGE $TARGET_IMAGE - docker push $TARGET_IMAGE -branch: - extends: .docker_tag - variables: - IMAGE_TAG: $CI_COMMIT_REF_SLUG - only: - - branches - except: - - master - edge: extends: .docker_tag variables: |
