diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4526552a83f85c1affdbda45416e52eb8671913c..6b014f22ce1019e540cd07e23b20cb2eb66a8264 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,64 +69,64 @@ variables: stages: - build - test - - review +# - review # - dast - - staging - - canary +# - staging +# - canary - jar - publish - - production - - incremental rollout 10% - - incremental rollout 25% - - incremental rollout 50% - - incremental rollout 100% - - performance - - cleanup +# - production +# - incremental rollout 10% +# - incremental rollout 25% +# - incremental rollout 50% +# - incremental rollout 100% +# - performance +# - cleanup include: - - template: Jobs/Build.gitlab-ci.yml - - template: Jobs/Test.gitlab-ci.yml +# - template: Jobs/Build.gitlab-ci.yml +# - template: Jobs/Test.gitlab-ci.yml # - template: Jobs/Code-Quality.gitlab-ci.yml - - template: Jobs/Deploy.gitlab-ci.yml - - template: Jobs/Browser-Performance-Testing.gitlab-ci.yml +# - template: Jobs/Deploy.gitlab-ci.yml +# - template: Jobs/Browser-Performance-Testing.gitlab-ci.yml # - template: Security/DAST.gitlab-ci.yml #re-enable when testing website # - template: Security/Container-Scanning.gitlab-ci.yml # - template: Security/Dependency-Scanning.gitlab-ci.yml #Wait for GitLab 12.0 - - template: License-Management.gitlab-ci.yml +# - template: License-Management.gitlab-ci.yml # - template: Security/SAST.gitlab-ci.yml -trampoline: - image: - name: "timvanderhorst/trampoline:auta" - entrypoint: [""] - stage: test - allow_failure: true - script: - - cd /home/trampoline ; python3 run.py - artifacts: - paths: - - report.json - - report.html - expire_in: 1 week - -trampoline-feedback: - image: - name: "timvanderhorst/trampoline:auta" - entrypoint: [""] - variables: - AUTA_ASSIGNMENT_ID: 5cda623347fc2b00068befa1 - stage: test - allow_failure: true - script: - - cd /home/trampoline ; python3 run.py - artifacts: - paths: - - report.json - - report.html - - benchmark_CYCLOMATIC_COMPLEXITY_METHOD.html - - benchmark_METHOD_EFFECTIVE_LOC_METHOD.html - - benchmark_PARAMETER_COUNT_METHOD.html - expire_in: 1 week +#trampoline: +# image: +# name: "timvanderhorst/trampoline:auta" +# entrypoint: [""] +# stage: test +# allow_failure: true +# script: +# - cd /home/trampoline ; python3 run.py +# artifacts: +# paths: +# - report.json +# - report.html +# expire_in: 1 week +# +#trampoline-feedback: +# image: +# name: "timvanderhorst/trampoline:auta" +# entrypoint: [""] +# variables: +# AUTA_ASSIGNMENT_ID: 5cda623347fc2b00068befa1 +# stage: test +# allow_failure: true +# script: +# - cd /home/trampoline ; python3 run.py +# artifacts: +# paths: +# - report.json +# - report.html +# - benchmark_CYCLOMATIC_COMPLEXITY_METHOD.html +# - benchmark_METHOD_EFFECTIVE_LOC_METHOD.html +# - benchmark_PARAMETER_COUNT_METHOD.html +# expire_in: 1 week checkstyle: # image: $CI_REGISTRY/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA @@ -165,11 +165,12 @@ jar-worker: expire_in: 1h publish-core: - image: registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image/master:stable + image: docker:19.03.13 variables: DOCKER_TLS_CERTDIR: "" + DOCKER_HOST: tcp://docker:2375 services: - - docker:19.03.5-dind + - docker:19.03.13-dind only: - branches stage: publish @@ -177,14 +178,15 @@ publish-core: - jar-core script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - devops/build-slim-image core $CI_COMMIT_REF_NAME + - sh devops/build-slim-image core $CI_COMMIT_REF_NAME publish-worker: - image: registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image/master:stable + image: docker:19.03.13 variables: DOCKER_TLS_CERTDIR: "" + DOCKER_HOST: tcp://docker:2375 services: - - docker:19.03.5-dind + - docker:19.03.13-dind only: - branches stage: publish @@ -192,10 +194,11 @@ publish-worker: - jar-worker script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - devops/build-slim-image worker $CI_COMMIT_REF_NAME + - sh devops/build-slim-image worker $CI_COMMIT_REF_NAME # Override DAST job to exclude master branch #dast: # except: # refs: # - master +