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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
a8db638d
Commit
a8db638d
authored
3 years ago
by
Jan David Mol
Browse files
Options
Downloads
Patches
Plain Diff
L2SS-287
: Fix merging of gitlab-ci between fixing integration tests and packaging
parent
bdd9d2c2
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!146
L2SS-287: implement python packaging
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+13
-27
13 additions, 27 deletions
.gitlab-ci.yml
with
13 additions
and
27 deletions
.gitlab-ci.yml
+
13
−
27
View file @
a8db638d
...
...
@@ -51,15 +51,9 @@ unit_test:
-
sudo apt-get update
-
sudo apt-get install -y git
script
:
<<<<<<< HEAD
-
cd tangostationcontrol
-
tox -e py37
integration_test
:
=======
- cd devices
- tox -e py37
integration_test_docker
:
>
>>>>>>
master
stage
:
integration-tests
image
:
docker:latest
tags
:
...
...
@@ -73,26 +67,6 @@ integration_test_docker:
-
apk add --update bind-tools
-
docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script
:
<<<<<<< HEAD
- touch /home/$USER/.Xauthority
- source bootstrap/etc/lofar20rc.sh
- export HOSTNAME=$(cat /run/systemd/netif/leases/2 | grep ^ADDRESS= | awk -F'=' '{print $2}')
- echo $HOSTNAME
- sudo $CI_PROJECT_DIR/sbin/run_integration_test.sh
wheel_packaging
:
stage
:
packaging
artifacts
:
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
:
-
cd tangostationcontrol
-
python setup.py bdist_wheel
=======
-
touch /root/.Xauthority
# Hack BASH_SOURCE into sourced files, docker its sh shell won't set this
-
export BASH_SOURCE=$(pwd)/bootstrap/etc/lofar20rc.sh
...
...
@@ -108,4 +82,16 @@ wheel_packaging:
-
chmod u+x $CI_PROJECT_DIR/sbin/run_integration_test.sh
# Do not remove 'bash' or statement will be ignored by primitive docker shell
-
bash $CI_PROJECT_DIR/sbin/run_integration_test.sh
>
>>>>>>
master
wheel_packaging
:
stage
:
packaging
artifacts
:
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
:
-
cd tangostationcontrol
-
python setup.py bdist_wheel
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