From bccb12a24aa579bbe5b033685f8245c01cbb0258 Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 15:08:43 +0000
Subject: [PATCH 01/15] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34da92d2..fbf25a76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,10 +14,16 @@ gitlab run_tests:
- source ~/catkin_ws/devel/setup.bash
- screen -S sim -L -dm bash -c "cd ~/catkin_ws/src/acomms_tests/launch && roslaunch acomms_tests queue_test.launch"
- sleep 5
- - rosrun acomms_tests queueTest.py
- - rosrun acomms_tests fragmentationTest.py "$MSG_SIZE"
+ - cd ~/catkin_ws/src/acomms_tests/src
+ - pytest --junitxml=report.xml
+ - cp report.xml $CI_PROJECT_DIR/report.xml
+ - cd -
- screen -X -S sim quit
- cat screenlog.0
+ artifacts:
+ when: always
+ reports:
+ junit: report.xml
pypi run_tests:
stage: test
@@ -34,7 +40,13 @@ pypi run_tests:
- pip install -I -r requirements.txt
- screen -S sim -L -dm bash -c "cd ~/catkin_ws/src/acomms_tests/launch && roslaunch acomms_tests queue_test.launch"
- sleep 5
- - rosrun acomms_tests queueTest.py
- - rosrun acomms_tests fragmentationTest.py "$MSG_SIZE"
+ - cd ~/catkin_ws/src/acomms_tests/src
+ - pytest --junitxml=report.xml
+ - cp report.xml $CI_PROJECT_DIR/report.xml
+ - cd -
- screen -X -S sim quit
- - cat screenlog.0
\ No newline at end of file
+ - cat screenlog.0
+ artifacts:
+ when: always
+ reports:
+ junit: report.xml
\ No newline at end of file
--
GitLab
From 06bd89f7076858a9e69dc44fbce38a55e7ae0dff Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 16:16:23 +0000
Subject: [PATCH 02/15] modifying for pytest capability
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbf25a76..ce28aebc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ gitlab run_tests:
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- mv ros_acomms ~/catkin_ws/src/
- - cd ~/catkin_ws/src/acomms_tests && git pull
+ - cd ~/catkin_ws/src/acomms_tests && git checkout -b dev/pytest && git pull
- cd ~/catkin_ws/src/ltcodec && git pull && pip install .
- cd ~/catkin_ws/src/pyacomms && git pull && pip install .
- cd ~/catkin_ws/ && catkin_make
@@ -33,7 +33,7 @@ pypi run_tests:
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- mv ros_acomms ~/catkin_ws/src/
- - cd ~/catkin_ws/src/acomms_tests && git pull
+ - cd ~/catkin_ws/src/acomms_tests && git checkout -b dev/pytest && git pull
- cd ~/catkin_ws/ && catkin_make
- source ~/catkin_ws/devel/setup.bash
- roscd ros_acomms
--
GitLab
From dd2e433c99b0b851dafe9ee328676dfee6908a6c Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 16:26:30 +0000
Subject: [PATCH 03/15] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce28aebc..83d58acb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ gitlab run_tests:
script:
- source /opt/ros/noetic/setup.bash
- pip install -r requirements.txt
+ - pip install -U pytest
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- mv ros_acomms ~/catkin_ws/src/
@@ -38,6 +39,7 @@ pypi run_tests:
- source ~/catkin_ws/devel/setup.bash
- roscd ros_acomms
- pip install -I -r requirements.txt
+ - pip install -U pytest
- screen -S sim -L -dm bash -c "cd ~/catkin_ws/src/acomms_tests/launch && roslaunch acomms_tests queue_test.launch"
- sleep 5
- cd ~/catkin_ws/src/acomms_tests/src
--
GitLab
From 19dc38e14f4e7f9f0450cd11c1e4db117902aa6d Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 16:27:15 +0000
Subject: [PATCH 04/15] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83d58acb..18e12a0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ gitlab run_tests:
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- mv ros_acomms ~/catkin_ws/src/
- - cd ~/catkin_ws/src/acomms_tests && git checkout -b dev/pytest && git pull
+ - cd ~/catkin_ws/src/acomms_tests && git checkout -b origin/dev/pytest && git pull
- cd ~/catkin_ws/src/ltcodec && git pull && pip install .
- cd ~/catkin_ws/src/pyacomms && git pull && pip install .
- cd ~/catkin_ws/ && catkin_make
@@ -34,7 +34,7 @@ pypi run_tests:
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- mv ros_acomms ~/catkin_ws/src/
- - cd ~/catkin_ws/src/acomms_tests && git checkout -b dev/pytest && git pull
+ - cd ~/catkin_ws/src/acomms_tests && git checkout -b origin/dev/pytest && git pull
- cd ~/catkin_ws/ && catkin_make
- source ~/catkin_ws/devel/setup.bash
- roscd ros_acomms
--
GitLab
From 8b0223f77e832fa25704c9dbf65f2039b8151286 Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 16:45:55 +0000
Subject: [PATCH 05/15] fixed pull of acomms_tests
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18e12a0d..41dd7a4d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ gitlab run_tests:
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- mv ros_acomms ~/catkin_ws/src/
- - cd ~/catkin_ws/src/acomms_tests && git checkout -b origin/dev/pytest && git pull
+ - cd ~/catkin_ws/src/acomms_tests && git pull origin dev/pytest
- cd ~/catkin_ws/src/ltcodec && git pull && pip install .
- cd ~/catkin_ws/src/pyacomms && git pull && pip install .
- cd ~/catkin_ws/ && catkin_make
@@ -34,7 +34,7 @@ pypi run_tests:
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- mv ros_acomms ~/catkin_ws/src/
- - cd ~/catkin_ws/src/acomms_tests && git checkout -b origin/dev/pytest && git pull
+ - cd ~/catkin_ws/src/acomms_tests && git pull origin dev/pytest
- cd ~/catkin_ws/ && catkin_make
- source ~/catkin_ws/devel/setup.bash
- roscd ros_acomms
--
GitLab
From cbd0e878a9b0cc71442362235f898d09dc5b25f3 Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 16:57:53 +0000
Subject: [PATCH 06/15] Move report.xml to known location for export
---
.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41dd7a4d..69a230c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,10 +17,11 @@ gitlab run_tests:
- sleep 5
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
- - cp report.xml $CI_PROJECT_DIR/report.xml
- cd -
- screen -X -S sim quit
- cat screenlog.0
+ after_script:
+ - cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
reports:
@@ -44,10 +45,11 @@ pypi run_tests:
- sleep 5
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
- - cp report.xml $CI_PROJECT_DIR/report.xml
- cd -
- screen -X -S sim quit
- cat screenlog.0
+ after_script:
+ - cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
reports:
--
GitLab
From 65b7912f9890ddfcf2235d46da3788a2e874c26e Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 17:10:26 +0000
Subject: [PATCH 07/15] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69a230c2..f0e0dfda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@ gitlab run_tests:
- screen -X -S sim quit
- cat screenlog.0
after_script:
+ - mkdir -p $CI_PROJECT_DIR
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
@@ -49,6 +50,7 @@ pypi run_tests:
- screen -X -S sim quit
- cat screenlog.0
after_script:
+ - mkdir -p $CI_PROJECT_DIR
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
--
GitLab
From ebe0c031cdd4a4df98ede85a60da90128315426b Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 17:13:31 +0000
Subject: [PATCH 08/15] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0e0dfda..7cdcc29c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ gitlab run_tests:
- pip install -U pytest
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- - mv ros_acomms ~/catkin_ws/src/
+ - cp -r ros_acomms ~/catkin_ws/src/
- cd ~/catkin_ws/src/acomms_tests && git pull origin dev/pytest
- cd ~/catkin_ws/src/ltcodec && git pull && pip install .
- cd ~/catkin_ws/src/pyacomms && git pull && pip install .
@@ -21,7 +21,6 @@ gitlab run_tests:
- screen -X -S sim quit
- cat screenlog.0
after_script:
- - mkdir -p $CI_PROJECT_DIR
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
@@ -35,7 +34,7 @@ pypi run_tests:
- source /opt/ros/noetic/setup.bash
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- - mv ros_acomms ~/catkin_ws/src/
+ - cp -r ros_acomms ~/catkin_ws/src/
- cd ~/catkin_ws/src/acomms_tests && git pull origin dev/pytest
- cd ~/catkin_ws/ && catkin_make
- source ~/catkin_ws/devel/setup.bash
@@ -50,7 +49,6 @@ pypi run_tests:
- screen -X -S sim quit
- cat screenlog.0
after_script:
- - mkdir -p $CI_PROJECT_DIR
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
--
GitLab
From 089b55380b80857129107bd1e301cec4a292c15d Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 18:30:42 +0000
Subject: [PATCH 09/15] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cdcc29c..401dbf6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,10 +17,10 @@ gitlab run_tests:
- sleep 5
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
- - cd -
+ after_script:
+ - cd ~/catkin_ws/src/acomms_tests/launch
- screen -X -S sim quit
- cat screenlog.0
- after_script:
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
@@ -45,10 +45,10 @@ pypi run_tests:
- sleep 5
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
- - cd -
+ after_script:
+ - cd ~/catkin_ws/src/acomms_tests/launch
- screen -X -S sim quit
- cat screenlog.0
- after_script:
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
--
GitLab
From 7135e0d048d260c555530e37d022f7625943f61d Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 18:39:53 +0000
Subject: [PATCH 10/15] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 401dbf6c..f2b15a14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,9 +17,9 @@ gitlab run_tests:
- sleep 5
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
+ - screen -X -S sim quit
after_script:
- cd ~/catkin_ws/src/acomms_tests/launch
- - screen -X -S sim quit
- cat screenlog.0
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
@@ -45,9 +45,9 @@ pypi run_tests:
- sleep 5
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
+ - screen -X -S sim quit
after_script:
- cd ~/catkin_ws/src/acomms_tests/launch
- - screen -X -S sim quit
- cat screenlog.0
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
--
GitLab
From 66b63bda39aaecbde57f8cfd066c150ca42c0161 Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 18:50:53 +0000
Subject: [PATCH 11/15] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2b15a14..0fc492f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,9 +18,9 @@ gitlab run_tests:
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
- screen -X -S sim quit
- after_script:
- cd ~/catkin_ws/src/acomms_tests/launch
- cat screenlog.0
+ after_script:
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
@@ -46,6 +46,8 @@ pypi run_tests:
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
- screen -X -S sim quit
+ - cd ~/catkin_ws/src/acomms_tests/launch
+ - cat screenlog.0
after_script:
- cd ~/catkin_ws/src/acomms_tests/launch
- cat screenlog.0
--
GitLab
From 81b21e0701f56b2de3ceb564783a194595d496a2 Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 18:57:28 +0000
Subject: [PATCH 12/15] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0fc492f9..cdc4a5ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ gitlab run_tests:
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
- screen -X -S sim quit
- - cd ~/catkin_ws/src/acomms_tests/launch
+ - cd ~/catkin_ws/
- cat screenlog.0
after_script:
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
@@ -46,11 +46,9 @@ pypi run_tests:
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
- screen -X -S sim quit
- - cd ~/catkin_ws/src/acomms_tests/launch
+ - cd ~/catkin_ws/
- cat screenlog.0
after_script:
- - cd ~/catkin_ws/src/acomms_tests/launch
- - cat screenlog.0
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
--
GitLab
From 05c006c9a526846c42b8bf71818d629baa7cc0e7 Mon Sep 17 00:00:00 2001
From: Nathan Ware <nware@whoi.edu>
Date: Tue, 16 Aug 2022 19:15:42 +0000
Subject: [PATCH 13/15] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdc4a5ae..53db6c3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,9 +18,9 @@ gitlab run_tests:
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
- screen -X -S sim quit
+ after_script:
- cd ~/catkin_ws/
- cat screenlog.0
- after_script:
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
@@ -41,14 +41,15 @@ pypi run_tests:
- roscd ros_acomms
- pip install -I -r requirements.txt
- pip install -U pytest
+ - cd ~/catkin_ws/
- screen -S sim -L -dm bash -c "cd ~/catkin_ws/src/acomms_tests/launch && roslaunch acomms_tests queue_test.launch"
- sleep 5
- cd ~/catkin_ws/src/acomms_tests/src
- pytest --junitxml=report.xml
- screen -X -S sim quit
+ after_script:
- cd ~/catkin_ws/
- cat screenlog.0
- after_script:
- cp ~/catkin_ws/src/acomms_tests/src/report.xml $CI_PROJECT_DIR/report.xml
artifacts:
when: always
--
GitLab
From ce2801ff5db972c5bf24f689357a99826d2c998e Mon Sep 17 00:00:00 2001
From: Eric Gallimore <egallimore@whoi.edu>
Date: Fri, 16 Sep 2022 23:44:12 +0000
Subject: [PATCH 14/15] Update .gitlab-ci.yml to pull from master branch on
acomms_tests (rather than dev/pytest)
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53db6c3e..a1fa17dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ gitlab run_tests:
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- cp -r ros_acomms ~/catkin_ws/src/
- - cd ~/catkin_ws/src/acomms_tests && git pull origin dev/pytest
+ - cd ~/catkin_ws/src/acomms_tests && git pull origin master
- cd ~/catkin_ws/src/ltcodec && git pull && pip install .
- cd ~/catkin_ws/src/pyacomms && git pull && pip install .
- cd ~/catkin_ws/ && catkin_make
@@ -54,4 +54,4 @@ pypi run_tests:
artifacts:
when: always
reports:
- junit: report.xml
\ No newline at end of file
+ junit: report.xml
--
GitLab
From 9680c9243344646809f14a76b74f9a25435d30fa Mon Sep 17 00:00:00 2001
From: Eric Gallimore <egallimore@whoi.edu>
Date: Fri, 16 Sep 2022 23:44:58 +0000
Subject: [PATCH 15/15] Update .gitlab-ci.yml to pull from master branch on
acomms_tests (rather than dev/pytest) in pypi test
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1fa17dc..e4a2c366 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ pypi run_tests:
- cd ../
- rm -r ~/catkin_ws/src/ros_acomms
- cp -r ros_acomms ~/catkin_ws/src/
- - cd ~/catkin_ws/src/acomms_tests && git pull origin dev/pytest
+ - cd ~/catkin_ws/src/acomms_tests && git pull origin master
- cd ~/catkin_ws/ && catkin_make
- source ~/catkin_ws/devel/setup.bash
- roscd ros_acomms
--
GitLab