Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tango
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
6ef2e6cf
Commit
6ef2e6cf
authored
2 years ago
by
Corné Lukken
Committed by
Jan David Mol
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
L2SS-790
: Removed duplicate steps spread across common base image
parent
f9f8500f
No related branches found
No related tags found
1 merge request
!334
L2SS-790: Removed duplicate steps spread across common base image
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+0
-20
0 additions, 20 deletions
.gitlab-ci.yml
docker-compose/lofar-device-base/Dockerfile
+1
-2
1 addition, 2 deletions
docker-compose/lofar-device-base/Dockerfile
with
1 addition
and
22 deletions
.gitlab-ci.yml
+
0
−
20
View file @
6ef2e6cf
...
@@ -449,42 +449,27 @@ newline_at_eof:
...
@@ -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
-
flake8 --filename *.sh,*.conf,*.md,*.yml --select=W292 --exclude docker-compose/tango-prometheus-exporter,.tox,.egg-info,docker
python_linting
:
python_linting
:
stage
:
linting
stage
:
linting
before_script
:
-
sudo apt-get update
-
sudo apt-get install -y git
script
:
script
:
-
cd tangostationcontrol
-
cd tangostationcontrol
-
tox -e pep8
-
tox -e pep8
bandit
:
bandit
:
stage
:
static-analysis
stage
:
static-analysis
before_script
:
-
sudo apt-get update
-
sudo apt-get install -y git
script
:
script
:
-
cd tangostationcontrol
-
cd tangostationcontrol
-
tox -e bandit
-
tox -e bandit
xenon
:
xenon
:
stage
:
static-analysis
stage
:
static-analysis
allow_failure
:
true
allow_failure
:
true
before_script
:
-
sudo apt-get update
-
sudo apt-get install -y git
script
:
script
:
-
cd tangostationcontrol
-
cd tangostationcontrol
-
tox -e xenon
-
tox -e xenon
shellcheck
:
shellcheck
:
stage
:
static-analysis
stage
:
static-analysis
before_script
:
-
sudo apt-get update
-
sudo apt-get install -y shellcheck
script
:
script
:
# TODO(Corne): Ignore shell files in submodules
# TODO(Corne): Ignore shell files in submodules
-
shellcheck **/*.sh
-
shellcheck **/*.sh
sphinx-documentation
:
sphinx-documentation
:
stage
:
documentation
stage
:
documentation
before_script
:
-
sudo apt-get update
-
sudo apt-get install -y git graphviz
script
:
script
:
-
cd tangostationcontrol
-
cd tangostationcontrol
-
tox -e docs
-
tox -e docs
...
@@ -493,9 +478,6 @@ sphinx-documentation:
...
@@ -493,9 +478,6 @@ sphinx-documentation:
-
tangostationcontrol/docs/build/
-
tangostationcontrol/docs/build/
unit_test
:
unit_test
:
stage
:
unit-tests
stage
:
unit-tests
before_script
:
-
sudo apt-get update
-
sudo apt-get install -y git
script
:
script
:
-
cd tangostationcontrol
-
cd tangostationcontrol
-
tox -e cover
-
tox -e cover
...
@@ -560,8 +542,6 @@ wheel_packaging:
...
@@ -560,8 +542,6 @@ wheel_packaging:
paths
:
paths
:
-
tangostationcontrol/dist/*.whl
-
tangostationcontrol/dist/*.whl
before_script
:
before_script
:
-
sudo apt-get update
-
sudo apt-get install -y git
-
pip3 install -r tangostationcontrol/test-requirements.txt
-
pip3 install -r tangostationcontrol/test-requirements.txt
-
pip3 install -r docker-compose/itango/lofar-requirements.txt
-
pip3 install -r docker-compose/itango/lofar-requirements.txt
script
:
script
:
...
...
This diff is collapsed.
Click to expand it.
docker-compose/lofar-device-base/Dockerfile
+
1
−
2
View file @
6ef2e6cf
ARG
SOURCE_IMAGE
ARG
SOURCE_IMAGE
FROM
${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
COPY
docker-compose/lofar-device-base/lofar-requirements.txt /lofar-requirements.txt
RUN
sudo
pip3
install
-r
/lofar-requirements.txt
RUN
sudo
pip3
install
-r
/lofar-requirements.txt
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment