Remove redis ping and consolidate before steps

This commit is contained in:
Erik Kalkoken 2021-05-05 09:04:43 +00:00 committed by Ariel Rin
parent 75a3adb2c9
commit 937d656227

View File

@ -7,28 +7,28 @@ include:
- template: Dependency-Scanning.gitlab-ci.yml - template: Dependency-Scanning.gitlab-ci.yml
- template: Security/SAST.gitlab-ci.yml - template: Security/SAST.gitlab-ci.yml
before_script:
- apt-get update && apt-get install redis-server -y
- redis-server --daemonize yes
- python -V
- pip install wheel tox
sast: sast:
stage: gitlab stage: gitlab
before_script: []
dependency_scanning: dependency_scanning:
stage: gitlab stage: gitlab
before_script: before_script:
- apt-get update && apt-get install redis-server libmariadbclient-dev -y - apt-get update && apt-get install redis-server libmariadbclient-dev -y
- redis-server --daemonize yes - redis-server --daemonize yes
- redis-cli ping
- python -V - python -V
- pip install wheel tox - pip install wheel tox
test-3.6-core: test-3.6-core:
image: python:3.6-buster image: python:3.6-buster
script: script:
- tox -e py36-core - tox -e py36-core
before_script:
- apt-get update && apt-get install redis-server -y
- redis-server --daemonize yes
- redis-cli ping
- python -V
- pip install wheel tox
artifacts: artifacts:
when: always when: always
reports: reports:
@ -38,12 +38,6 @@ test-3.7-core:
image: python:3.7-buster image: python:3.7-buster
script: script:
- tox -e py37-core - tox -e py37-core
before_script:
- apt-get update && apt-get install redis-server -y
- redis-server --daemonize yes
- redis-cli ping
- python -V
- pip install wheel tox
artifacts: artifacts:
when: always when: always
reports: reports:
@ -53,12 +47,6 @@ test-3.8-core:
image: python:3.8-buster image: python:3.8-buster
script: script:
- tox -e py38-core - tox -e py38-core
before_script:
- apt-get update && apt-get install redis-server -y
- redis-server --daemonize yes
- redis-cli ping
- python -V
- pip install wheel tox
artifacts: artifacts:
when: always when: always
reports: reports:
@ -68,12 +56,6 @@ test-3.6-all:
image: python:3.6-buster image: python:3.6-buster
script: script:
- tox -e py36-all - tox -e py36-all
before_script:
- apt-get update && apt-get install redis-server -y
- redis-server --daemonize yes
- redis-cli ping
- python -V
- pip install wheel tox
artifacts: artifacts:
when: always when: always
reports: reports:
@ -83,12 +65,6 @@ test-3.7-all:
image: python:3.7-buster image: python:3.7-buster
script: script:
- tox -e py37-all - tox -e py37-all
before_script:
- apt-get update && apt-get install redis-server -y
- redis-server --daemonize yes
- redis-cli ping
- python -V
- pip install wheel tox
artifacts: artifacts:
when: always when: always
reports: reports:
@ -98,12 +74,6 @@ test-3.8-all:
image: python:3.8-buster image: python:3.8-buster
script: script:
- tox -e py38-all - tox -e py38-all
before_script:
- apt-get update && apt-get install redis-server -y
- redis-server --daemonize yes
- redis-cli ping
- python -V
- pip install wheel tox
artifacts: artifacts:
when: always when: always
reports: reports: