From a8db638df42a1578987bd5f4e76aaf0a2f8612af Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 27 Oct 2021 23:13:57 +0200
Subject: [PATCH] L2SS-287: Fix merging of gitlab-ci between fixing integration
tests and packaging
---
.gitlab-ci.yml | 40 +++++++++++++---------------------------
1 file changed, 13 insertions(+), 27 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cc164dc1..27593ca87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
--
GitLab