From 6ef2e6cfe8a833d5b248bc7466f450b467a8d648 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Tue, 10 May 2022 05:15:22 +0000
Subject: [PATCH] L2SS-790: Removed duplicate steps spread across common base
image
---
.gitlab-ci.yml | 20 --------------------
docker-compose/lofar-device-base/Dockerfile | 3 +--
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e38e66a4..9527c42ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -449,42 +449,27 @@ newline_at_eof:
- flake8 --filename *.sh,*.conf,*.md,*.yml --select=W292 --exclude docker-compose/tango-prometheus-exporter,.tox,.egg-info,docker
python_linting:
stage: linting
- before_script:
- - sudo apt-get update
- - sudo apt-get install -y git
script:
- cd tangostationcontrol
- tox -e pep8
bandit:
stage: static-analysis
- before_script:
- - sudo apt-get update
- - sudo apt-get install -y git
script:
- cd tangostationcontrol
- tox -e bandit
xenon:
stage: static-analysis
allow_failure: true
- before_script:
- - sudo apt-get update
- - sudo apt-get install -y git
script:
- cd tangostationcontrol
- tox -e xenon
shellcheck:
stage: static-analysis
- before_script:
- - sudo apt-get update
- - sudo apt-get install -y shellcheck
script:
# TODO(Corne): Ignore shell files in submodules
- shellcheck **/*.sh
sphinx-documentation:
stage: documentation
- before_script:
- - sudo apt-get update
- - sudo apt-get install -y git graphviz
script:
- cd tangostationcontrol
- tox -e docs
@@ -493,9 +478,6 @@ sphinx-documentation:
- tangostationcontrol/docs/build/
unit_test:
stage: unit-tests
- before_script:
- - sudo apt-get update
- - sudo apt-get install -y git
script:
- cd tangostationcontrol
- tox -e cover
@@ -560,8 +542,6 @@ wheel_packaging:
paths:
- tangostationcontrol/dist/*.whl
before_script:
- - sudo apt-get update
- - sudo apt-get install -y git
- pip3 install -r tangostationcontrol/test-requirements.txt
- pip3 install -r docker-compose/itango/lofar-requirements.txt
script:
diff --git a/docker-compose/lofar-device-base/Dockerfile b/docker-compose/lofar-device-base/Dockerfile
index f81503c89..cd52ab361 100644
--- a/docker-compose/lofar-device-base/Dockerfile
+++ b/docker-compose/lofar-device-base/Dockerfile
@@ -1,8 +1,7 @@
ARG SOURCE_IMAGE
FROM ${SOURCE_IMAGE}
-RUN sudo apt-get update && sudo apt-get install -y git g++ gcc python3-dev && sudo apt-get clean
-
+RUN sudo apt-get update && sudo apt-get install -y git g++ gcc shellcheck graphviz python3-dev && sudo apt-get clean
COPY docker-compose/lofar-device-base/lofar-requirements.txt /lofar-requirements.txt
RUN sudo pip3 install -r /lofar-requirements.txt
--
GitLab