From 59395432d42c504d4781d089baf6911c80384ecc Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 16:50:47 +0100 Subject: [PATCH 001/145] Add .gitlab-ci.yml file --- .gitlab-ci.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..765ddac90 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,47 @@ +# Is performed before the scripts in the stages step +before_script: + - source /etc/profile + +# Defines stages which are to be executed +stages: + - build + - test + +# Stage "build" +run-build: + stage: build + script: + - apt-get update + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - cd build + - cmake -DENABLE_OSMOSDR=ON .. + - make -j2 + - make install + # This stage is only executed for new tags + # only: + # - tags + + # The files which are to be made available in GitLab + artifacts: + paths: + - install/* + +# Stage "test" +run-test: + stage: test + script: + - apt-get update + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - mkdir build-test + - cd build-test + - cmake .. + - make -j2 + - make check + - ../install/run_tests --gtest_output=xml + - mv *.xml ../build/ + - cd .. + - rm -rf build-test + + artifacts: + paths: + - build/*.xml From 5d03eaa802aca4f2e16b257888928e821eba0227 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 16:53:41 +0100 Subject: [PATCH 002/145] Replace googletest by libgtest-dev --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 765ddac90..7caddcd2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ run-build: stage: build script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake -DENABLE_OSMOSDR=ON .. - make -j2 @@ -31,7 +31,7 @@ run-test: stage: test script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - mkdir build-test - cd build-test - cmake .. From b7aeadf8fca833db47205e2d5659a5c156f9b8ab Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 16:58:53 +0100 Subject: [PATCH 003/145] Remove libuhd-dev --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7caddcd2a..25e40f875 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ run-build: stage: build script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake -DENABLE_OSMOSDR=ON .. - make -j2 @@ -31,7 +31,7 @@ run-test: stage: test script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - mkdir build-test - cd build-test - cmake .. From f56ed763e540c2db3efae7784a493bae32a84b54 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 17:10:14 +0100 Subject: [PATCH 004/145] Remove libuhd-dev --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25e40f875..f86aa8016 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,9 @@ run-build: stage: build script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libgnuradio-blocks3.7.5 libgnuradio-runtime3.7.5 libgnuradio-filter3.7.5 libgnuradio-pmt3.7.5 libgnuradio-analog3.7.5 libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake .. - make -j2 - make install # This stage is only executed for new tags @@ -31,7 +31,7 @@ run-test: stage: test script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libgnuradio-blocks3.7.5 libgnuradio-runtime3.7.5 libgnuradio-filter3.7.5 libgnuradio-pmt3.7.5 libgnuradio-analog3.7.5 libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - mkdir build-test - cd build-test - cmake .. From 14cafb3c1ad12c431c1bf82aac62228d8371d928 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 17:17:18 +0100 Subject: [PATCH 005/145] Add volk --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f86aa8016..dedaa6c17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ run-build: stage: build script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libgnuradio-blocks3.7.5 libgnuradio-runtime3.7.5 libgnuradio-filter3.7.5 libgnuradio-pmt3.7.5 libgnuradio-analog3.7.5 libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libgnuradio-blocks3.7.5 libgnuradio-runtime3.7.5 libgnuradio-filter3.7.5 libgnuradio-pmt3.7.5 libgnuradio-analog3.7.5 libvolk-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake .. - make -j2 @@ -31,7 +31,7 @@ run-test: stage: test script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libgnuradio-blocks3.7.5 libgnuradio-runtime3.7.5 libgnuradio-filter3.7.5 libgnuradio-pmt3.7.5 libgnuradio-analog3.7.5 libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libgnuradio-blocks3.7.5 libgnuradio-runtime3.7.5 libgnuradio-filter3.7.5 libgnuradio-pmt3.7.5 libgnuradio-analog3.7.5 libvolk-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - mkdir build-test - cd build-test - cmake .. From b372a7f5f6f3e6c87dcff13b8ad5ec19e7b56141 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 17:25:23 +0100 Subject: [PATCH 006/145] Fix gnuradio in jessie --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dedaa6c17..cfe7e4350 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ run-build: stage: build script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libgnuradio-blocks3.7.5 libgnuradio-runtime3.7.5 libgnuradio-filter3.7.5 libgnuradio-pmt3.7.5 libgnuradio-analog3.7.5 libvolk-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake .. - make -j2 @@ -31,7 +31,7 @@ run-test: stage: test script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev libgnuradio-blocks3.7.5 libgnuradio-runtime3.7.5 libgnuradio-filter3.7.5 libgnuradio-pmt3.7.5 libgnuradio-analog3.7.5 libvolk-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - mkdir build-test - cd build-test - cmake .. From 0d25ba2deff06ba9139602f3819e17688695cada Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 17:31:49 +0100 Subject: [PATCH 007/145] Fix uhd-host in jessie --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cfe7e4350..8eb54eaf7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ run-build: stage: build script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake .. - make -j2 @@ -31,7 +31,7 @@ run-test: stage: test script: - apt-get update - - apt-get install -y build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - mkdir build-test - cd build-test - cmake .. From 7e01f59011f3cad7bd577fceafbbc0a57c746ea4 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 17:37:03 +0100 Subject: [PATCH 008/145] Fix gnuradio in jessie --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8eb54eaf7..182b0f69c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ run-build: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake .. - make -j2 @@ -31,7 +31,7 @@ run-test: stage: test script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - mkdir build-test - cd build-test - cmake .. From e0797063ca0725a3402d5110c2259d397ffac912 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 18:21:23 +0100 Subject: [PATCH 009/145] Fix libmatio in jessie --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 182b0f69c..eea4ba285 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ run-build: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libhdf5-dev libgtest-dev - cd build - cmake .. - make -j2 @@ -31,7 +31,7 @@ run-test: stage: test script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libhdf5-dev libgtest-dev - mkdir build-test - cd build-test - cmake .. From 156eeb517ac95502e022c1c47134e9eb9545963b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 19:13:51 +0100 Subject: [PATCH 010/145] Try multiple images --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eea4ba285..f463f27ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,17 @@ run-build: paths: - install/* +run-build-debian-stretch: + image: debian:9.3-slim + stage: build + script: + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libhdf5-dev libgtest-dev + - cd build + - cmake .. + - make -j2 + - make install + # Stage "test" run-test: stage: test From c1515b12898000f13cde0660ba8272b50d612d00 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 19:34:15 +0100 Subject: [PATCH 011/145] Add multiple images --- .gitlab-ci.yml | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f463f27ba..4aca8ea0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,18 +17,35 @@ run-build: - cmake .. - make -j2 - make install - # This stage is only executed for new tags - # only: - # - tags - # The files which are to be made available in GitLab - artifacts: - paths: - - install/* + +run-build-debian-jessie: + image: debian:8.10-slim + stage: build + script: + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - cd build + - cmake .. + - make -j2 + - make install + run-build-debian-stretch: image: debian:9.3-slim stage: build + script: + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - cd build + - cmake .. + - make -j2 + - make install + + +run-build-ubuntu-16.04: + image: ubuntu:xenial + stage: build script: - apt-get update - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libhdf5-dev libgtest-dev @@ -37,6 +54,18 @@ run-build-debian-stretch: - make -j2 - make install + +run-build-ubuntu-18.04: + image: ubuntu:bionic + stage: build + script: + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - cd build + - cmake .. + - make -j2 + - make install + # Stage "test" run-test: stage: test From 8d9c3fbc24d9d6aa1af73164126ed6688cb63234 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 19:37:02 +0100 Subject: [PATCH 012/145] Fix Jessie --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4aca8ea0f..3d78047a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ run-build-debian-jessie: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake .. - make -j2 From 08241a1b67a9cc4c86c0767036e40b2e50c12ad5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 19:44:45 +0100 Subject: [PATCH 013/145] Add buster --- .gitlab-ci.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d78047a3..dde38a720 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ run-build: - make install -run-build-debian-jessie: +debian-jessie-build: image: debian:8.10-slim stage: build script: @@ -31,7 +31,7 @@ run-build-debian-jessie: - make install -run-build-debian-stretch: +debian-stretch-build: image: debian:9.3-slim stage: build script: @@ -43,19 +43,31 @@ run-build-debian-stretch: - make install -run-build-ubuntu-16.04: - image: ubuntu:xenial +debian-buster-build: + image: debian:buster-slim stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libhdf5-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - cmake .. - make -j2 - make install -run-build-ubuntu-18.04: +ubuntu-16.04-build: + image: ubuntu:xenial + stage: build + script: + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - cd build + - cmake .. + - make -j2 + - make install + + +ubuntu-18.04-build: image: ubuntu:bionic stage: build script: From 0aed45c48dc1fd25883d39f7c3ee55e23d6b4576 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 20:39:39 +0100 Subject: [PATCH 014/145] Remove redundant job --- .gitlab-ci.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dde38a720..e0ae91796 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,16 +8,6 @@ stages: - test # Stage "build" -run-build: - stage: build - script: - - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libhdf5-dev libgtest-dev - - cd build - - cmake .. - - make -j2 - - make install - debian-jessie-build: image: debian:8.10-slim @@ -80,10 +70,11 @@ ubuntu-18.04-build: # Stage "test" run-test: + image: debian:9.3-slim stage: test script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libhdf5-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - mkdir build-test - cd build-test - cmake .. From d3db7e9d1d2e5585f1f5456442f8e47194b8deda Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 22:17:08 +0100 Subject: [PATCH 015/145] Test different archs --- .gitlab-ci.yml | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0ae91796..355f10550 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,6 @@ stages: - test # Stage "build" - debian-jessie-build: image: debian:8.10-slim stage: build @@ -21,7 +20,7 @@ debian-jessie-build: - make install -debian-stretch-build: +debian-stretch-amd64-build: image: debian:9.3-slim stage: build script: @@ -32,6 +31,41 @@ debian-stretch-build: - make -j2 - make install +debian-stretch-i386-build: + image: i386/debian:9.3-slim + stage: build + script: + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - cd build + - cmake .. + - make -j2 + - make install + + +debian-stretch-arm32-build: + image: arm32v7/debian:9.3-slim + stage: build + script: + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - cd build + - cmake .. + - make -j2 + - make install + + +debian-stretch-arm64-build: + image: arm64v8/debian:9.3-slim + stage: build + script: + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - cd build + - cmake .. + - make -j2 + - make install + debian-buster-build: image: debian:buster-slim From c9f519151fd38a4d0e0763ad14ed52704ab03e03 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 22:35:38 +0100 Subject: [PATCH 016/145] Remove ARM architectures --- .gitlab-ci.yml | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 355f10550..bf195908a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,7 @@ debian-stretch-amd64-build: - make -j2 - make install + debian-stretch-i386-build: image: i386/debian:9.3-slim stage: build @@ -43,30 +44,6 @@ debian-stretch-i386-build: - make install -debian-stretch-arm32-build: - image: arm32v7/debian:9.3-slim - stage: build - script: - - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - - cd build - - cmake .. - - make -j2 - - make install - - -debian-stretch-arm64-build: - image: arm64v8/debian:9.3-slim - stage: build - script: - - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - - cd build - - cmake .. - - make -j2 - - make install - - debian-buster-build: image: debian:buster-slim stage: build @@ -102,6 +79,7 @@ ubuntu-18.04-build: - make -j2 - make install + # Stage "test" run-test: image: debian:9.3-slim From d098a56ca6a026bde9c17dcaa01d53cf2dc1a2c1 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 23:48:17 +0100 Subject: [PATCH 017/145] Add Docker image build --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf195908a..57d40c9cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,6 +79,20 @@ ubuntu-18.04-build: - make -j2 - make install +docker-gnsssdr: + image: docker:latest + services: + - docker:dind + before_script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + script: + - mkdir docker-build + - cd docker-build + - git clone https://github.com/carlesfernandez/docker-gnsssdr + - cd docker-gnsssdr + - docker build -t --pull carlesfernandez/docker-gnsssdr . + - docker push "$CI_REGISTRY_IMAGE" + # Stage "test" run-test: From 654ce90d0be8aed1d7fca378484c43345b0680b5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 23:49:48 +0100 Subject: [PATCH 018/145] Add Docker image build --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57d40c9cd..5bfcd7e48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,6 +81,7 @@ ubuntu-18.04-build: docker-gnsssdr: image: docker:latest + stage: build services: - docker:dind before_script: From a6135c449991590ef5689909cacdeb8f18809fd7 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Feb 2018 23:52:26 +0100 Subject: [PATCH 019/145] Fix Docker image build --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5bfcd7e48..20095bd1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,6 +87,8 @@ docker-gnsssdr: before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: + - apt-get update + - apt-get install -y --no-install-recommends git - mkdir docker-build - cd docker-build - git clone https://github.com/carlesfernandez/docker-gnsssdr From 6d881c3ac10256214f68f589a3992a7e8159ce3b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Feb 2018 00:39:25 +0100 Subject: [PATCH 020/145] Fix Docker image build --- .gitlab-ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20095bd1d..1e120854d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,6 +79,7 @@ ubuntu-18.04-build: - make -j2 - make install + docker-gnsssdr: image: docker:latest stage: build @@ -87,13 +88,9 @@ docker-gnsssdr: before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - - apt-get update - - apt-get install -y --no-install-recommends git - mkdir docker-build - cd docker-build - - git clone https://github.com/carlesfernandez/docker-gnsssdr - - cd docker-gnsssdr - - docker build -t --pull carlesfernandez/docker-gnsssdr . + - docker build -t --pull carlesfernandez/docker-gnsssdr github.com/carlesfernandez/docker-gnsssdr - docker push "$CI_REGISTRY_IMAGE" From 918f11c34546ff892c102266c2fd9bb1614ea279 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Feb 2018 00:43:45 +0100 Subject: [PATCH 021/145] Fix Docker image build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e120854d..9208f61b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ docker-gnsssdr: script: - mkdir docker-build - cd docker-build - - docker build -t --pull carlesfernandez/docker-gnsssdr github.com/carlesfernandez/docker-gnsssdr + - docker build -t carlesfernandez/docker-gnsssdr github.com/carlesfernandez/docker-gnsssdr - docker push "$CI_REGISTRY_IMAGE" From caebea5fd6cd3a2575b48c026cb2a851f4472945 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Feb 2018 00:57:17 +0100 Subject: [PATCH 022/145] Fix Docker image build --- .gitlab-ci.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9208f61b8..a9b364f5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,6 +80,18 @@ ubuntu-18.04-build: - make install +get-dockerfile: + image: debian:9.3-slim + stage: build + script: + - apt-get update + - apt-get install -y --no-install-recommends git + - git clone https://github.com/carlesfernandez/docker-gnsssdr + artifacts: + paths: + - docker-gnsssdr/ + + docker-gnsssdr: image: docker:latest stage: build @@ -90,8 +102,11 @@ docker-gnsssdr: script: - mkdir docker-build - cd docker-build - - docker build -t carlesfernandez/docker-gnsssdr github.com/carlesfernandez/docker-gnsssdr + - cp ../docker-gnsssdr/Dockerfile . + - docker build -t -pull carlesfernandez/docker-gnsssdr . - docker push "$CI_REGISTRY_IMAGE" + dependencies: + - get-dockerfile # Stage "test" From d035855be2b5b2c4e5f2fcdc9d676c866ff654e5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Feb 2018 00:59:41 +0100 Subject: [PATCH 023/145] Fix Docker image build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9b364f5c..f5dbe30ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,7 +94,7 @@ get-dockerfile: docker-gnsssdr: image: docker:latest - stage: build + stage: test services: - docker:dind before_script: From e196a83060a12cdea6a38698d77a0b0a68b0ca3b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Feb 2018 01:04:32 +0100 Subject: [PATCH 024/145] Fix Docker image build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5dbe30ad..b0db54f77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,7 +85,7 @@ get-dockerfile: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends git + - apt-get install -y git ca-certificates - git clone https://github.com/carlesfernandez/docker-gnsssdr artifacts: paths: From bbec8b29d2f959d400b21d890eb5da297747ca67 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Feb 2018 01:36:19 +0100 Subject: [PATCH 025/145] Fix Docker image build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0db54f77..23131a922 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,7 +103,7 @@ docker-gnsssdr: - mkdir docker-build - cd docker-build - cp ../docker-gnsssdr/Dockerfile . - - docker build -t -pull carlesfernandez/docker-gnsssdr . + - docker build -t carlesfernandez/docker-gnsssdr . - docker push "$CI_REGISTRY_IMAGE" dependencies: - get-dockerfile From b601e80acd69cc6a3d67660ccf45f6f4ad2a83bb Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Feb 2018 02:54:17 +0100 Subject: [PATCH 026/145] Move docker to deploy stage --- .gitlab-ci.yml | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 23131a922..bb08c384a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ before_script: stages: - build - test + - deploy # Stage "build" debian-jessie-build: @@ -92,23 +93,6 @@ get-dockerfile: - docker-gnsssdr/ -docker-gnsssdr: - image: docker:latest - stage: test - services: - - docker:dind - before_script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - script: - - mkdir docker-build - - cd docker-build - - cp ../docker-gnsssdr/Dockerfile . - - docker build -t carlesfernandez/docker-gnsssdr . - - docker push "$CI_REGISTRY_IMAGE" - dependencies: - - get-dockerfile - - # Stage "test" run-test: image: debian:9.3-slim @@ -129,3 +113,21 @@ run-test: artifacts: paths: - build/*.xml + + +# Stage "deploy" +docker-gnsssdr: + image: docker:latest + stage: deploy + services: + - docker:dind + before_script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + script: + - mkdir docker-build + - cd docker-build + - cp ../docker-gnsssdr/Dockerfile . + - docker build -t carlesfernandez/docker-gnsssdr . + - docker push carlesfernandez/docker-gnsssdr + dependencies: + - get-dockerfile From 2d64b30373c39c237c771f9e80c560b1703d70d4 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Feb 2018 11:16:05 +0100 Subject: [PATCH 027/145] Try to push Docker image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb08c384a..262086545 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,7 +122,7 @@ docker-gnsssdr: services: - docker:dind before_script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - mkdir docker-build - cd docker-build From 03b134495bf18f6955227fb579c7b0301ffcf3f6 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Feb 2018 14:41:11 +0100 Subject: [PATCH 028/145] Run tests in 64 and 32 bits architectures --- .gitlab-ci.yml | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 262086545..35575b835 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,25 +94,48 @@ get-dockerfile: # Stage "test" -run-test: +run-test-amd64: image: debian:9.3-slim stage: test script: - apt-get update - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - mkdir build-test + - mkdir build64 - cd build-test - cmake .. - make -j2 - make check - ../install/run_tests --gtest_output=xml - - mv *.xml ../build/ + - mv *.xml ../build64/ - cd .. - rm -rf build-test artifacts: paths: - - build/*.xml + - build64/*.xml + + +run-test-i386: + image: i386/debian:9.3-slim + stage: test + script: + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - mkdir build-test + - mkdir build32 + - cd build-test + - cmake .. + - make -j2 + - make check + - ../install/run_tests --gtest_output=xml + - mv *.xml ../build32/ + - cd .. + - rm -rf build-test + + artifacts: + paths: + - build32/*.xml # Stage "deploy" From 42d71348c54f422ee916c7fc099b3c2d3294a370 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 11 Feb 2018 00:48:09 +0100 Subject: [PATCH 029/145] Fix tests in i386 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35575b835..bee091c65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,7 +125,7 @@ run-test-i386: - mkdir build-test - mkdir build32 - cd build-test - - cmake .. + - cmake -DENABLE_PACKAGING=ON .. - make -j2 - make check - ../install/run_tests --gtest_output=xml From 54173ca5a8f14e6ac593699fa09c671f8160f79c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 11 Feb 2018 13:34:46 +0100 Subject: [PATCH 030/145] Give more informative names for jobs --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bee091c65..d76bb1393 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: - deploy # Stage "build" -debian-jessie-build: +debian8.10: image: debian:8.10-slim stage: build script: @@ -21,7 +21,7 @@ debian-jessie-build: - make install -debian-stretch-amd64-build: +debian9.3-amd64: image: debian:9.3-slim stage: build script: @@ -33,7 +33,7 @@ debian-stretch-amd64-build: - make install -debian-stretch-i386-build: +debian9.3_i386: image: i386/debian:9.3-slim stage: build script: @@ -45,7 +45,7 @@ debian-stretch-i386-build: - make install -debian-buster-build: +debian-buster: image: debian:buster-slim stage: build script: From 244d17260c70bdce97daf8fe9fc1e58af64ce130 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 11 Feb 2018 13:51:32 +0100 Subject: [PATCH 031/145] Give more informative names for jobs --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d76bb1393..ecfdf2aad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ debian8.10: - make install -debian9.3-amd64: +debian9.3: image: debian:9.3-slim stage: build script: @@ -33,7 +33,7 @@ debian9.3-amd64: - make install -debian9.3_i386: +debian9.3-i386: image: i386/debian:9.3-slim stage: build script: @@ -45,7 +45,7 @@ debian9.3_i386: - make install -debian-buster: +debian10: image: debian:buster-slim stage: build script: @@ -57,7 +57,7 @@ debian-buster: - make install -ubuntu-16.04-build: +ubuntu16.04: image: ubuntu:xenial stage: build script: @@ -69,7 +69,7 @@ ubuntu-16.04-build: - make install -ubuntu-18.04-build: +ubuntu18.04: image: ubuntu:bionic stage: build script: @@ -94,7 +94,7 @@ get-dockerfile: # Stage "test" -run-test-amd64: +run-tests-amd64: image: debian:9.3-slim stage: test script: @@ -116,7 +116,7 @@ run-test-amd64: - build64/*.xml -run-test-i386: +run-tests-i386: image: i386/debian:9.3-slim stage: test script: From 7c43031edd96ccd635d5bce1b4ea4dae2da787d1 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 12:04:18 +0100 Subject: [PATCH 032/145] Add Experiment job --- .gitlab-ci.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ecfdf2aad..04eece2be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ stages: - build - test - deploy +# - experiment # Stage "build" debian8.10: @@ -154,3 +155,24 @@ docker-gnsssdr: - docker push carlesfernandez/docker-gnsssdr dependencies: - get-dockerfile + + +# Stage "experiment" +run-experiment: + image: debian:9.3-slim + stage: build + script: + - apt-get update + # Grab analysis and representation tools + - apt-get octave + # Grab the data set + - apt-get install -y curl + - curl https://zenodo.org/record/1172670/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz + - tar xvzf L2_signal_samples.tar.xz ./data/ + - cd data + - md5sum L2_signal_samples.dat > data.md5 + - md5sum -c data.md5 + + artifacts: + paths: + - data/*.dat From ecb57bc324a9dd42635b875da46baf0600f355c5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 12:07:12 +0100 Subject: [PATCH 033/145] Fix Experiment job --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04eece2be..0e17958a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,7 +164,7 @@ run-experiment: script: - apt-get update # Grab analysis and representation tools - - apt-get octave + - apt-get install -y octave # Grab the data set - apt-get install -y curl - curl https://zenodo.org/record/1172670/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz From f68ef5fb116efff66405b78736fad5741f1fdbda Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 12:13:47 +0100 Subject: [PATCH 034/145] Fix Experiment job --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e17958a4..d38cae1e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,6 +164,7 @@ run-experiment: script: - apt-get update # Grab analysis and representation tools + - apt-get install -y openjdk-8-jre-headless default-jre-headless ca-certificates-java - apt-get install -y octave # Grab the data set - apt-get install -y curl From 04e6cdcac715c3faf42b884c10d3e55c597d1eac Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 12:43:33 +0100 Subject: [PATCH 035/145] Fix Experiment job --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d38cae1e2..e909be7e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -163,6 +163,7 @@ run-experiment: stage: build script: - apt-get update + - apt-get upgrade # Grab analysis and representation tools - apt-get install -y openjdk-8-jre-headless default-jre-headless ca-certificates-java - apt-get install -y octave From 797b49f4bf8c95ffef48664f8e9bf62b31b082ea Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 12:45:05 +0100 Subject: [PATCH 036/145] Fix Experiment job --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e909be7e3..aa0d1dd80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -163,7 +163,7 @@ run-experiment: stage: build script: - apt-get update - - apt-get upgrade + - apt-get upgrade -y # Grab analysis and representation tools - apt-get install -y openjdk-8-jre-headless default-jre-headless ca-certificates-java - apt-get install -y octave From 28b8dcf3d978042e5a0aaceeacfe40909e7c0b3e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 12:48:19 +0100 Subject: [PATCH 037/145] Fix Experiment job --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa0d1dd80..64c6a5784 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,7 +165,6 @@ run-experiment: - apt-get update - apt-get upgrade -y # Grab analysis and representation tools - - apt-get install -y openjdk-8-jre-headless default-jre-headless ca-certificates-java - apt-get install -y octave # Grab the data set - apt-get install -y curl From 329224ea23f4a75249d4fcd8f83c5f445597e5df Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 12:53:18 +0100 Subject: [PATCH 038/145] Put Experiment in a container --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64c6a5784..67609c870 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -159,7 +159,7 @@ docker-gnsssdr: # Stage "experiment" run-experiment: - image: debian:9.3-slim + image: carlesfernandez/docker-gnsssdr:latest stage: build script: - apt-get update From d68bcc184a1a2f58f312285ac1d39f6cc9d76caf Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 13:01:46 +0100 Subject: [PATCH 039/145] Fix tar arguments --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67609c870..eee365fa3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,9 +167,9 @@ run-experiment: # Grab analysis and representation tools - apt-get install -y octave # Grab the data set - - apt-get install -y curl + - apt-get install -y curl xz-utils - curl https://zenodo.org/record/1172670/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz - - tar xvzf L2_signal_samples.tar.xz ./data/ + - tar xvfJ L2_signal_samples.tar.xz ./data/ - cd data - md5sum L2_signal_samples.dat > data.md5 - md5sum -c data.md5 From 1f33daa210db91eef5a159f6939782f12269fe91 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 13:08:38 +0100 Subject: [PATCH 040/145] Create data folder --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eee365fa3..ea64f9737 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,7 +167,8 @@ run-experiment: # Grab analysis and representation tools - apt-get install -y octave # Grab the data set - - apt-get install -y curl xz-utils + - mkdir data + - apt-get install -y curl - curl https://zenodo.org/record/1172670/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz - tar xvfJ L2_signal_samples.tar.xz ./data/ - cd data From 17dd8e162bcf375014c81396a719705bb6a89546 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 14:15:20 +0100 Subject: [PATCH 041/145] Fix tar parameters --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea64f9737..97c86df79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,11 +167,11 @@ run-experiment: # Grab analysis and representation tools - apt-get install -y octave # Grab the data set - - mkdir data - apt-get install -y curl - - curl https://zenodo.org/record/1172670/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz - - tar xvfJ L2_signal_samples.tar.xz ./data/ + - mkdir data - cd data + - curl https://zenodo.org/record/1172670/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz + - tar xvfJ L2_signal_samples.tar.xz - md5sum L2_signal_samples.dat > data.md5 - md5sum -c data.md5 From 7d7cc02d8896bc377d957a873be04660d4daab69 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 14:19:29 +0100 Subject: [PATCH 042/145] Data folder already created --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97c86df79..b465ee315 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -168,7 +168,6 @@ run-experiment: - apt-get install -y octave # Grab the data set - apt-get install -y curl - - mkdir data - cd data - curl https://zenodo.org/record/1172670/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz - tar xvfJ L2_signal_samples.tar.xz From ba09ff8aa8df9e3e91c5f14548c71541b9f39b8c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 14:54:54 +0100 Subject: [PATCH 043/145] Test Octave figure generation --- .gitlab-ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b465ee315..c3569eb18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -173,7 +173,13 @@ run-experiment: - tar xvfJ L2_signal_samples.tar.xz - md5sum L2_signal_samples.dat > data.md5 - md5sum -c data.md5 - + - cd .. + # Execute the experiment + - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\displaystyle\leftarrow x = {2\over\sqrt{\pi}}' '\int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.pdf\", \"-dpdflatexstandalone\"); " >> my_test_file.m + - octave my_test_file.m + - mkdir results + - cp results.pdf results/ + artifacts: paths: - - data/*.dat + - results/*.pdf From 91c907230c85bfdcd1dca0c26ce96b51ab844020 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 15:34:48 +0100 Subject: [PATCH 044/145] Add packages --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3569eb18..dd087ced4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,7 +165,7 @@ run-experiment: - apt-get update - apt-get upgrade -y # Grab analysis and representation tools - - apt-get install -y octave + - apt-get install -y octave epstool fig2dev # Grab the data set - apt-get install -y curl - cd data @@ -174,12 +174,12 @@ run-experiment: - md5sum L2_signal_samples.dat > data.md5 - md5sum -c data.md5 - cd .. - # Execute the experiment + # Execute the experiment (example) - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\displaystyle\leftarrow x = {2\over\sqrt{\pi}}' '\int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.pdf\", \"-dpdflatexstandalone\"); " >> my_test_file.m - octave my_test_file.m - mkdir results - cp results.pdf results/ - + artifacts: paths: - results/*.pdf From 851d9a99acbb74a6b541afa1aefac0016bc2b9c2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 15:39:21 +0100 Subject: [PATCH 045/145] Remove fig2dev --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd087ced4..37293628a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,7 +165,7 @@ run-experiment: - apt-get update - apt-get upgrade -y # Grab analysis and representation tools - - apt-get install -y octave epstool fig2dev + - apt-get install -y octave epstool # Grab the data set - apt-get install -y curl - cd data From 89b64623fe620c818e35dd568959191c414c44b1 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 15:47:18 +0100 Subject: [PATCH 046/145] Add slang-xfig --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37293628a..02ac1151d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,7 +165,7 @@ run-experiment: - apt-get update - apt-get upgrade -y # Grab analysis and representation tools - - apt-get install -y octave epstool + - apt-get install -y octave epstool slang-xfig transfig # Grab the data set - apt-get install -y curl - cd data From 9a563f02cc40c272fef2e2e6e6145618f958b3aa Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 16:00:34 +0100 Subject: [PATCH 047/145] Use pdf option in octave --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02ac1151d..fe2510146 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,8 +175,8 @@ run-experiment: - md5sum -c data.md5 - cd .. # Execute the experiment (example) - - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\displaystyle\leftarrow x = {2\over\sqrt{\pi}}' '\int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.pdf\", \"-dpdflatexstandalone\"); " >> my_test_file.m - - octave my_test_file.m + - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\displaystyle\leftarrow x = {2\over\sqrt{\pi}}' '\int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.pdf\", \"-pdf\"); " >> my_test_file.m + - octave --no-gui my_test_file.m - mkdir results - cp results.pdf results/ From 4be7f08ce47e32315b657a97a5f8d75f3a255693 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 16:26:38 +0100 Subject: [PATCH 048/145] Use pdf device for printing --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe2510146..82c6e8762 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,7 +165,7 @@ run-experiment: - apt-get update - apt-get upgrade -y # Grab analysis and representation tools - - apt-get install -y octave epstool slang-xfig transfig + - apt-get install -y octave texlive-latex-base texlive-fonts-recommended texlive-latex-extra # Grab the data set - apt-get install -y curl - cd data @@ -175,7 +175,7 @@ run-experiment: - md5sum -c data.md5 - cd .. # Execute the experiment (example) - - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\displaystyle\leftarrow x = {2\over\sqrt{\pi}}' '\int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.pdf\", \"-pdf\"); " >> my_test_file.m + - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\displaystyle\leftarrow x = {2\over\sqrt{\pi}}' '\int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.pdf\", \"-dpdf\"); " > my_test_file.m - octave --no-gui my_test_file.m - mkdir results - cp results.pdf results/ From 27781d3c2b78c36b2559324473a991eb92c70616 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 17:27:05 +0100 Subject: [PATCH 049/145] Remove get-dockerfile job --- .gitlab-ci.yml | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82c6e8762..8473d8cbb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,18 +82,6 @@ ubuntu18.04: - make install -get-dockerfile: - image: debian:9.3-slim - stage: build - script: - - apt-get update - - apt-get install -y git ca-certificates - - git clone https://github.com/carlesfernandez/docker-gnsssdr - artifacts: - paths: - - docker-gnsssdr/ - - # Stage "test" run-tests-amd64: image: debian:9.3-slim @@ -146,6 +134,9 @@ docker-gnsssdr: services: - docker:dind before_script: + - apt-get update + - apt-get install -y git ca-certificates + - git clone https://github.com/carlesfernandez/docker-gnsssdr - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - mkdir docker-build @@ -153,8 +144,6 @@ docker-gnsssdr: - cp ../docker-gnsssdr/Dockerfile . - docker build -t carlesfernandez/docker-gnsssdr . - docker push carlesfernandez/docker-gnsssdr - dependencies: - - get-dockerfile # Stage "experiment" @@ -165,7 +154,7 @@ run-experiment: - apt-get update - apt-get upgrade -y # Grab analysis and representation tools - - apt-get install -y octave texlive-latex-base texlive-fonts-recommended texlive-latex-extra + - apt-get install -y octave texlive-latex-base texlive-fonts-recommended texlive-latex-extra epstool transfig octave # Grab the data set - apt-get install -y curl - cd data @@ -175,8 +164,9 @@ run-experiment: - md5sum -c data.md5 - cd .. # Execute the experiment (example) - - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\displaystyle\leftarrow x = {2\over\sqrt{\pi}}' '\int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.pdf\", \"-dpdf\"); " > my_test_file.m + - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\displaystyle\leftarrow x = {2\over\sqrt{\pi}}' '\int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.eps\", \"-deps\"); " > my_test_file.m - octave --no-gui my_test_file.m + - epspdf results.eps results.pdf - mkdir results - cp results.pdf results/ From 71645b4e2405b263016de69e3967876b3242592e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 19:46:28 +0100 Subject: [PATCH 050/145] Minor fixes --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8473d8cbb..4299293ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ ubuntu18.04: # Stage "test" -run-tests-amd64: +run-tests: image: debian:9.3-slim stage: test script: @@ -133,12 +133,11 @@ docker-gnsssdr: stage: deploy services: - docker:dind - before_script: + script: - apt-get update - apt-get install -y git ca-certificates - git clone https://github.com/carlesfernandez/docker-gnsssdr - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - script: - mkdir docker-build - cd docker-build - cp ../docker-gnsssdr/Dockerfile . @@ -152,7 +151,6 @@ run-experiment: stage: build script: - apt-get update - - apt-get upgrade -y # Grab analysis and representation tools - apt-get install -y octave texlive-latex-base texlive-fonts-recommended texlive-latex-extra epstool transfig octave # Grab the data set @@ -164,7 +162,7 @@ run-experiment: - md5sum -c data.md5 - cd .. # Execute the experiment (example) - - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\displaystyle\leftarrow x = {2\over\sqrt{\pi}}' '\int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.eps\", \"-deps\"); " > my_test_file.m + - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\leftarrow x = {frac{2}{\sqrt{\pi}}} \int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m - octave --no-gui my_test_file.m - epspdf results.eps results.pdf - mkdir results From b38c4fd469931f603d776fbe814292edae7075ed Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Feb 2018 23:03:28 +0100 Subject: [PATCH 051/145] Fix docker-gnsssdr job --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4299293ff..4c9fc1a3b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,9 +134,7 @@ docker-gnsssdr: services: - docker:dind script: - - apt-get update - - apt-get install -y git ca-certificates - - git clone https://github.com/carlesfernandez/docker-gnsssdr + - wget https://github.com/carlesfernandez/docker-gnsssdr/blob/master/Dockerfile - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - mkdir docker-build - cd docker-build From 991ecb8f370b0439abb57978d9cab5a2a4fe63a5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 15 Feb 2018 08:33:48 +0100 Subject: [PATCH 052/145] Fix docker deployment --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c9fc1a3b..8d17c6b86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,7 +138,7 @@ docker-gnsssdr: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - mkdir docker-build - cd docker-build - - cp ../docker-gnsssdr/Dockerfile . + - cp ../Dockerfile . - docker build -t carlesfernandez/docker-gnsssdr . - docker push carlesfernandez/docker-gnsssdr @@ -160,7 +160,7 @@ run-experiment: - md5sum -c data.md5 - cd .. # Execute the experiment (example) - - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$\leftarrow x = {frac{2}{\sqrt{\pi}}} \int_{0}^{x}e^{-t^2} dt = 0.6175$']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m + - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$ \leftarrow x = \frac{2}{\sqrt{\pi}} \int_{0}^{x}e^{-t^2} dt = 0.6175 $']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m - octave --no-gui my_test_file.m - epspdf results.eps results.pdf - mkdir results From 11c8134eb40533e1f067c36a812fd40dd209206d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 15 Feb 2018 11:07:35 +0100 Subject: [PATCH 053/145] Fix docker-gnsssdr job --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d17c6b86..d64a444e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,13 +134,16 @@ docker-gnsssdr: services: - docker:dind script: - - wget https://github.com/carlesfernandez/docker-gnsssdr/blob/master/Dockerfile + - wget https://raw.githubusercontent.com/carlesfernandez/docker-gnsssdr/master/Dockerfile - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - mkdir docker-build - cd docker-build - cp ../Dockerfile . - docker build -t carlesfernandez/docker-gnsssdr . - docker push carlesfernandez/docker-gnsssdr + only: + - next + allow_failure: true # Stage "experiment" @@ -150,7 +153,7 @@ run-experiment: script: - apt-get update # Grab analysis and representation tools - - apt-get install -y octave texlive-latex-base texlive-fonts-recommended texlive-latex-extra epstool transfig octave + - apt-get install -y texlive-latex-base texlive-fonts-recommended texlive-latex-extra epstool transfig octave # Grab the data set - apt-get install -y curl - cd data From dcfca027f4c802fd384bb507a0790af9cd5508fd Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 15 Feb 2018 11:31:48 +0100 Subject: [PATCH 054/145] Create a Docker image for the experiment --- .gitlab-ci.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d64a444e0..00a2b1ab9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,10 +146,26 @@ docker-gnsssdr: allow_failure: true +docker-experiment: + image: docker:latest + stage: deploy + services: + - docker:dind + script: + - wget https://raw.githubusercontent.com/carlesfernandez/docker-gnsssdr/master/Dockerfile + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + - mkdir docker-build + - cd docker-build + - cp ../Dockerfile . + - docker build -t carlesfernandez/docker-gnsssdr . + - docker tag carlesfernandez/docker-gnsssdr:latest carlesfernandez/docker-gnsssdr:test + - docker push carlesfernandez/docker-gnsssdr:test + + # Stage "experiment" run-experiment: - image: carlesfernandez/docker-gnsssdr:latest - stage: build + image: carlesfernandez/docker-gnsssdr:test + stage: experiment script: - apt-get update # Grab analysis and representation tools From 0b5bbce2eaea36cc2ed06dc11ff76ce219c7a1f8 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 15 Feb 2018 11:33:01 +0100 Subject: [PATCH 055/145] Create experiment stage --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00a2b1ab9..6e7e1f074 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: - build - test - deploy -# - experiment + - experiment # Stage "build" debian8.10: From d3824154dcbb0db44611cfea9cd2292913e2e649 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 15 Feb 2018 12:56:39 +0100 Subject: [PATCH 056/145] Put experiment name in a variable, so the system can be extended easily to more experiments --- .gitlab-ci.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e7e1f074..43c00e4d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,9 @@ before_script: - source /etc/profile +variables: + EXPERIMENT_NAME: "ieee-access18" + # Defines stages which are to be executed stages: - build @@ -146,7 +149,7 @@ docker-gnsssdr: allow_failure: true -docker-experiment: +docker-$EXPERIMENT_NAME: image: docker:latest stage: deploy services: @@ -158,13 +161,13 @@ docker-experiment: - cd docker-build - cp ../Dockerfile . - docker build -t carlesfernandez/docker-gnsssdr . - - docker tag carlesfernandez/docker-gnsssdr:latest carlesfernandez/docker-gnsssdr:test - - docker push carlesfernandez/docker-gnsssdr:test + - docker tag carlesfernandez/docker-gnsssdr:latest carlesfernandez/docker-gnsssdr:$EXPERIMENT_NAME + - docker push carlesfernandez/docker-gnsssdr:$EXPERIMENT_NAME # Stage "experiment" -run-experiment: - image: carlesfernandez/docker-gnsssdr:test +run-$EXPERIMENT_NAME: + image: carlesfernandez/docker-gnsssdr:$EXPERIMENT_NAME stage: experiment script: - apt-get update @@ -182,9 +185,9 @@ run-experiment: - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$ \leftarrow x = \frac{2}{\sqrt{\pi}} \int_{0}^{x}e^{-t^2} dt = 0.6175 $']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m - octave --no-gui my_test_file.m - epspdf results.eps results.pdf - - mkdir results - - cp results.pdf results/ + - mkdir $EXPERIMENT_NAME + - cp results.pdf $EXPERIMENT_NAME/ artifacts: paths: - - results/*.pdf + - $EXPERIMENT_NAME/*.pdf From aed04c1550329c1a2a8084035ae9b5012613df63 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 15 Feb 2018 13:02:07 +0100 Subject: [PATCH 057/145] Assign experiment name to job name --- .gitlab-ci.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43c00e4d7..1696f420e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,9 +2,6 @@ before_script: - source /etc/profile -variables: - EXPERIMENT_NAME: "ieee-access18" - # Defines stages which are to be executed stages: - build @@ -149,7 +146,7 @@ docker-gnsssdr: allow_failure: true -docker-$EXPERIMENT_NAME: +docker-ieee-access18: image: docker:latest stage: deploy services: @@ -161,13 +158,13 @@ docker-$EXPERIMENT_NAME: - cd docker-build - cp ../Dockerfile . - docker build -t carlesfernandez/docker-gnsssdr . - - docker tag carlesfernandez/docker-gnsssdr:latest carlesfernandez/docker-gnsssdr:$EXPERIMENT_NAME - - docker push carlesfernandez/docker-gnsssdr:$EXPERIMENT_NAME + - docker tag carlesfernandez/docker-gnsssdr:latest carlesfernandez/docker-gnsssdr:ieee-access18 + - docker push carlesfernandez/docker-gnsssdr:ieee-access18 # Stage "experiment" -run-$EXPERIMENT_NAME: - image: carlesfernandez/docker-gnsssdr:$EXPERIMENT_NAME +run-ieee-access18: + image: carlesfernandez/docker-gnsssdr:ieee-access18 stage: experiment script: - apt-get update @@ -185,9 +182,9 @@ run-$EXPERIMENT_NAME: - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$ \leftarrow x = \frac{2}{\sqrt{\pi}} \int_{0}^{x}e^{-t^2} dt = 0.6175 $']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m - octave --no-gui my_test_file.m - epspdf results.eps results.pdf - - mkdir $EXPERIMENT_NAME - - cp results.pdf $EXPERIMENT_NAME/ + - mkdir ieee-access18 + - cp results.pdf ieee-access18/ artifacts: paths: - - $EXPERIMENT_NAME/*.pdf + - ieee-access18/*.pdf From 8c71d2150f3ff83edb839251d4c0c9d82647142f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 15 Feb 2018 13:04:20 +0100 Subject: [PATCH 058/145] Shorten job names --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1696f420e..b865e2c2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,7 +146,7 @@ docker-gnsssdr: allow_failure: true -docker-ieee-access18: +docker-access18: image: docker:latest stage: deploy services: @@ -158,13 +158,13 @@ docker-ieee-access18: - cd docker-build - cp ../Dockerfile . - docker build -t carlesfernandez/docker-gnsssdr . - - docker tag carlesfernandez/docker-gnsssdr:latest carlesfernandez/docker-gnsssdr:ieee-access18 - - docker push carlesfernandez/docker-gnsssdr:ieee-access18 + - docker tag carlesfernandez/docker-gnsssdr:latest carlesfernandez/docker-gnsssdr:access18 + - docker push carlesfernandez/docker-gnsssdr:access18 # Stage "experiment" -run-ieee-access18: - image: carlesfernandez/docker-gnsssdr:ieee-access18 +run-access18: + image: carlesfernandez/docker-gnsssdr:access18 stage: experiment script: - apt-get update @@ -182,9 +182,9 @@ run-ieee-access18: - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$ \leftarrow x = \frac{2}{\sqrt{\pi}} \int_{0}^{x}e^{-t^2} dt = 0.6175 $']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m - octave --no-gui my_test_file.m - epspdf results.eps results.pdf - - mkdir ieee-access18 - - cp results.pdf ieee-access18/ + - mkdir access18 + - cp results.pdf access18/ artifacts: paths: - - ieee-access18/*.pdf + - access18/*.pdf From 136f3d22c278fda653c0fe752036080c5b66431f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 15 Feb 2018 19:18:35 +0100 Subject: [PATCH 059/145] Produce publishing-quality figure --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b865e2c2d..d6bfbf01f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,7 +165,7 @@ docker-access18: # Stage "experiment" run-access18: image: carlesfernandez/docker-gnsssdr:access18 - stage: experiment + stage: build script: - apt-get update # Grab analysis and representation tools @@ -179,7 +179,7 @@ run-access18: - md5sum -c data.md5 - cd .. # Execute the experiment (example) - - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$ \leftarrow x = \frac{2}{\sqrt{\pi}} \int_{0}^{x}e^{-t^2} dt = 0.6175 $']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m + - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$ \leftarrow x = \frac{2}{\sqrt{\pi}} \int_{0}^{x}e^{-t^2} dt = 0.6175 $']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); hh=findall(hf,\"-property\",\"FontName\"); set(hh,\"FontName\",\"Times\"); hh2=findall(hf,\"-property\",\"interpreter\"); set(hh2, \"interpreter\", \"tex\"); hh3=findall(hf,\"-property\",\"FontSize\"); set(hh3, \"FontSize\", 22); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m - octave --no-gui my_test_file.m - epspdf results.eps results.pdf - mkdir access18 From 57fc370ffad5b9063aedbce788c3c05525647de4 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 15 Feb 2018 22:01:09 +0100 Subject: [PATCH 060/145] Add docker-pybombs-gnsssdr job and file header. Try to meake it usable for other users --- .gitlab-ci.yml | 87 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6bfbf01f..d7c9ef1f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,59 @@ +# This script sets up a Continuous Reproducibility system for GNSS-SDR at GitLab +# +# Useful links: +# Website: http://gnss-sdr.org +# Upstream repository: https://github.com/gnss-sdr/gnss-sdr.git +# Dockerfile at https://github.com/carlesfernandez/docker-gnsssdr +# Docker cloud image: carlesfernandez/docker-gnsssdr +# +# In order to use this system and be able to make changes, you will need: +# - A GitHub account https://github.com +# - A GitLab account https://gitlab.com +# - A Docker Hub account https://hub.docker.com +# - A repository at Docker Hub. +# +# In order to use this system, please fork at GitHub the upstream +# repository; import that forked repo at GitLab; then add, commit and push to +# your GitLab repo this .gitlab-ci.yml file; and finally go to your project page +# at GitLab and set up the following secret variables. In the left panel: +# Settings > CI / CD > Secret variables +# +# CI_REGISTRY_USER <- Leave it blank +# CI_REGISTRY_PASWORD <- Leave it blank +# DOCKER_HUB_USER +# DOCKER_HUB_REPO +# DOCKER_HUB_PASSWORD +# +# For instance, my settings are: +# CI_REGISTRY_USER = carlesfernandez +# CI_REGISTRY_PASWORD = ******************** +# DOCKER_HUB_USER = carlesfernandez +# DOCKER_HUB_REPO = docker-gnsssdr +# DOCKER_HUB_PASSWORD = ******************** +# +# If you want to make changes in the source code, please branch-off from the +# 'next' branch of your forked repository and, if needed, add new jobs in this +# file at the 'deploy' and 'experiment' stages. You can also change the +# DOCKERFILE_URL variable below if your changes in the source code require extra +# packages or build steps. +# +# Feel free to delete the docker-gnsssdr and docker-pybombs-gnsssdr jobs, +# they are for developers' team only. Actually, this is their CI/CD system. +# +# More info about how to contribute to GNSS-SDR at +# https://github.com/gnss-sdr/gnss-sdr/blob/master/CONTRIBUTING.md +# +# (C) Carles Fernandez-Prades, 2018 cfernandez@cttc.cat + +variables: + DOCKERFILE_URL: "https://raw.githubusercontent.com/carlesfernandez/docker-gnsssdr/master/Dockerfile" + + # Is performed before the scripts in the stages step before_script: - source /etc/profile + # Defines stages which are to be executed stages: - build @@ -9,6 +61,7 @@ stages: - deploy - experiment + # Stage "build" debian8.10: image: debian:8.10-slim @@ -146,25 +199,43 @@ docker-gnsssdr: allow_failure: true +docker-pybombs-gnsssdr: + image: docker:latest + stage: deploy + services: + - docker:dind + script: + - wget https://raw.githubusercontent.com/carlesfernandez/docker-pybombs-gnsssdr/master/Dockerfile + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + - mkdir docker-build + - cd docker-build + - cp ../Dockerfile . + - docker build -t carlesfernandez/docker-pybombs-gnsssdr . + - docker push carlesfernandez/docker-pybombs-gnsssdr + only: + - next + allow_failure: true + + docker-access18: image: docker:latest stage: deploy services: - docker:dind script: - - wget https://raw.githubusercontent.com/carlesfernandez/docker-gnsssdr/master/Dockerfile - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + - wget $DOCKERFILE_URL + - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - mkdir docker-build - cd docker-build - cp ../Dockerfile . - - docker build -t carlesfernandez/docker-gnsssdr . - - docker tag carlesfernandez/docker-gnsssdr:latest carlesfernandez/docker-gnsssdr:access18 - - docker push carlesfernandez/docker-gnsssdr:access18 + - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . + - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 + - docker push $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 # Stage "experiment" run-access18: - image: carlesfernandez/docker-gnsssdr:access18 + image: $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 stage: build script: - apt-get update @@ -175,11 +246,11 @@ run-access18: - cd data - curl https://zenodo.org/record/1172670/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz - tar xvfJ L2_signal_samples.tar.xz - - md5sum L2_signal_samples.dat > data.md5 + - echo "2090ad3dfb3f461314252a1e6243d714 L2_signal_samples.tar.xz" > data.md5 - md5sum -c data.md5 - cd .. # Execute the experiment (example) - - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x)); hold on; plot (x, x, \"r\"); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['$ \leftarrow x = \frac{2}{\sqrt{\pi}} \int_{0}^{x}e^{-t^2} dt = 0.6175 $']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); hh=findall(hf,\"-property\",\"FontName\"); set(hh,\"FontName\",\"Times\"); hh2=findall(hf,\"-property\",\"interpreter\"); set(hh2, \"interpreter\", \"tex\"); hh3=findall(hf,\"-property\",\"FontSize\"); set(hh3, \"FontSize\", 22); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m + - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x), \"linewidth\", 2); hold on; plot (x, x, \"r\", \"linewidth\", 2); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['\leftarrow x = \pi \int_{0}^{x}e^{-t^2} dt = 0.6175 ']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); hh=findall(hf,\"-property\",\"FontName\"); set(hh,\"FontName\",\"Times\"); hh2=findall(hf,\"-property\",\"interpreter\"); set(hh2, \"interpreter\", \"tex\"); hh3=findall(hf,\"-property\",\"FontSize\"); set(hh3, \"FontSize\", 22); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m - octave --no-gui my_test_file.m - epspdf results.eps results.pdf - mkdir access18 From cbb2498dc4697392c7eb721298a7fffec720bb8c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 10:45:41 +0100 Subject: [PATCH 061/145] Move acces18 job to experiment stage --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7c9ef1f3..74af41981 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -236,7 +236,7 @@ docker-access18: # Stage "experiment" run-access18: image: $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 - stage: build + stage: experiment script: - apt-get update # Grab analysis and representation tools @@ -250,7 +250,8 @@ run-access18: - md5sum -c data.md5 - cd .. # Execute the experiment (example) - - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x), \"linewidth\", 2); hold on; plot (x, x, \"r\", \"linewidth\", 2); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['\leftarrow x = \pi \int_{0}^{x}e^{-t^2} dt = 0.6175 ']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); hh=findall(hf,\"-property\",\"FontName\"); set(hh,\"FontName\",\"Times\"); hh2=findall(hf,\"-property\",\"interpreter\"); set(hh2, \"interpreter\", \"tex\"); hh3=findall(hf,\"-property\",\"FontSize\"); set(hh3, \"FontSize\", 22); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m + - run_tests --gtest_filter==Multi* + - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x), \"linewidth\", 2); hold on; plot (x, x, \"r\", \"linewidth\", 2); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['\leftarrow x = \pi \int_{0}^{x}e^{-t^2} dt = 0.6175']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); hh=findall(hf,\"-property\",\"FontName\"); set(hh,\"FontName\",\"Times\"); hh2=findall(hf,\"-property\",\"interpreter\"); set(hh2, \"interpreter\", \"tex\"); hh3=findall(hf,\"-property\",\"FontSize\"); set(hh3, \"FontSize\", 22); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m - octave --no-gui my_test_file.m - epspdf results.eps results.pdf - mkdir access18 From 306129380d8c29d8e20bd579efa6cbdfd5071b2c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 13:19:30 +0100 Subject: [PATCH 062/145] Build this specific branch for the experiment --- .gitlab-ci.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74af41981..ee72b6290 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,9 +33,7 @@ # # If you want to make changes in the source code, please branch-off from the # 'next' branch of your forked repository and, if needed, add new jobs in this -# file at the 'deploy' and 'experiment' stages. You can also change the -# DOCKERFILE_URL variable below if your changes in the source code require extra -# packages or build steps. +# file at the 'deploy' and 'experiment' stages. # # Feel free to delete the docker-gnsssdr and docker-pybombs-gnsssdr jobs, # they are for developers' team only. Actually, this is their CI/CD system. @@ -45,11 +43,8 @@ # # (C) Carles Fernandez-Prades, 2018 cfernandez@cttc.cat -variables: - DOCKERFILE_URL: "https://raw.githubusercontent.com/carlesfernandez/docker-gnsssdr/master/Dockerfile" - -# Is performed before the scripts in the stages step +# This is performed before the scripts in the stages step before_script: - source /etc/profile @@ -219,15 +214,14 @@ docker-pybombs-gnsssdr: docker-access18: image: docker:latest - stage: deploy + stage: build services: - docker:dind script: - - wget $DOCKERFILE_URL - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - mkdir docker-build - cd docker-build - - cp ../Dockerfile . + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL\nRUN cd gnss-sdr/build\nRUN git checkout $CI_COMMIT_SHA\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 - docker push $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From ccd12b4e26662218e87fa137784790ec506f96a0 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 13:29:56 +0100 Subject: [PATCH 063/145] Fix access18 job --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee72b6290..b47f4dd8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -218,10 +218,10 @@ docker-access18: services: - docker:dind script: - - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - mkdir docker-build - cd docker-build - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL\nRUN cd gnss-sdr/build\nRUN git checkout $CI_COMMIT_SHA\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 - docker push $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From c074d2a199ab1ac2677f9b11a562792a34480751 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 13:36:13 +0100 Subject: [PATCH 064/145] Fix access18 job --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b47f4dd8c..9a16b3671 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,7 +221,7 @@ docker-access18: - mkdir docker-build - cd docker-build - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL\nRUN cd gnss-sdr/build\nRUN git checkout $CI_COMMIT_SHA\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" + - docker login -u "$DOCKER_HUB_USER" -p $DOCKER_HUB_PASSWORD - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 - docker push $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From ba45425f10ffbebdd808eca686dddbbbf034b5d2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 13:42:29 +0100 Subject: [PATCH 065/145] Fix access18 job --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a16b3671..707c7cacf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -220,8 +220,9 @@ docker-access18: script: - mkdir docker-build - cd docker-build + - echo "$DOCKER_HUB_USER" - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL\nRUN cd gnss-sdr/build\nRUN git checkout $CI_COMMIT_SHA\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - - docker login -u "$DOCKER_HUB_USER" -p $DOCKER_HUB_PASSWORD + - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" hub.docker.com/r/$DOCKER_HUB_USER/docker-gnsssdr/ - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 - docker push $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 349434bb2f5b5b2502420a7b0fa95a5d48bf350b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 13:45:57 +0100 Subject: [PATCH 066/145] Fix access18 job again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 707c7cacf..69a96b81e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,7 +222,7 @@ docker-access18: - cd docker-build - echo "$DOCKER_HUB_USER" - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL\nRUN cd gnss-sdr/build\nRUN git checkout $CI_COMMIT_SHA\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" hub.docker.com/r/$DOCKER_HUB_USER/docker-gnsssdr/ + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 - docker push $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 9d346145691aaad4464a599ae8c9ae74b10b70c5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 14:07:59 +0100 Subject: [PATCH 067/145] Fix access18 job again --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69a96b81e..648333653 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -220,7 +220,6 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo "$DOCKER_HUB_USER" - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL\nRUN cd gnss-sdr/build\nRUN git checkout $CI_COMMIT_SHA\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . From 21ebefe57d484d233556ba24568790a4090b3bf9 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 14:10:04 +0100 Subject: [PATCH 068/145] Fix access18 job again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 648333653..b47f4dd8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,7 +221,7 @@ docker-access18: - mkdir docker-build - cd docker-build - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL\nRUN cd gnss-sdr/build\nRUN git checkout $CI_COMMIT_SHA\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 - docker push $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 130e0fd43f65b4bef73fcf808ad3b07c64a825ec Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 14:20:37 +0100 Subject: [PATCH 069/145] Fix access18 job again --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b47f4dd8c..7cf58c65e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,9 @@ # DOCKER_HUB_REPO # DOCKER_HUB_PASSWORD # +# You will need either to protect your branch, or to leave those variables +# unproctected. +# # For instance, my settings are: # CI_REGISTRY_USER = carlesfernandez # CI_REGISTRY_PASWORD = ******************** @@ -220,7 +223,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL\nRUN cd gnss-sdr/build\nRUN git checkout $CI_COMMIT_SHA\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/$CI_REGISTRY_USER/gnss-sdr.git \nRUN cd gnss-sdr\nRUN git checkout $CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 57ffe33fb3ff70003577d5f9b2bc46f472c1c4e2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 14:31:53 +0100 Subject: [PATCH 070/145] Fix access18 job again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7cf58c65e..62c291729 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/$CI_REGISTRY_USER/gnss-sdr.git \nRUN cd gnss-sdr\nRUN git checkout $CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL \nRUN cd gnss-sdr\nRUN git checkout $CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From e39d05e476ca73642d48cfa6a51a6219bda44007 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 16:58:33 +0100 Subject: [PATCH 071/145] Another try --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62c291729..a75d8010b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL \nRUN cd gnss-sdr\nRUN git checkout $CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL \nRUN cd gnss-sdr\nRUNls -l .git\n\RUN chown $CI_REGISTRY_USER -R .git \nRUN git checkout $CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 448e5331888acf017edf5db8a6b2e083ce9f6974 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 17:00:21 +0100 Subject: [PATCH 072/145] Another try --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a75d8010b..6811b0166 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL \nRUN cd gnss-sdr\nRUNls -l .git\n\RUN chown $CI_REGISTRY_USER -R .git \nRUN git checkout $CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL \nRUN cd gnss-sdr\nRUN ls -l .git\n\RUN chown $CI_REGISTRY_USER -R .git \nRUN git checkout $CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 340587df118f4cd46c095da0edcebe8c872b000f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 17:01:22 +0100 Subject: [PATCH 073/145] Another try --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6811b0166..fed886523 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL \nRUN cd gnss-sdr\nRUN ls -l .git\n\RUN chown $CI_REGISTRY_USER -R .git \nRUN git checkout $CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL \nRUN cd gnss-sdr\nRUN ls -l .git\nRUN chown $CI_REGISTRY_USER -R .git \nRUN git checkout $CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 85b1a891e8c3441dca55e0e1049e75dc4f9303c2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 17:26:55 +0100 Subject: [PATCH 074/145] Another try --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fed886523..11d0e25e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN git clone $CI_REPOSITORY_URL \nRUN cd gnss-sdr\nRUN ls -l .git\nRUN chown $CI_REGISTRY_USER -R .git \nRUN git checkout $CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$CI_REGISTRY_USER/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From bba697a955d112ca9fea2d4e1319e75f2350ab88 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 17:35:12 +0100 Subject: [PATCH 075/145] Add wget --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11d0e25e6..ae4438821 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$CI_REGISTRY_USER/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$CI_REGISTRY_USER/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 19123ffdb3f72e85d2dcc9fdb38ab65eda486f99 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 17:43:01 +0100 Subject: [PATCH 076/145] Fix user --- .gitlab-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae4438821..3ac616331 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,8 +18,6 @@ # at GitLab and set up the following secret variables. In the left panel: # Settings > CI / CD > Secret variables # -# CI_REGISTRY_USER <- Leave it blank -# CI_REGISTRY_PASWORD <- Leave it blank # DOCKER_HUB_USER # DOCKER_HUB_REPO # DOCKER_HUB_PASSWORD @@ -28,8 +26,6 @@ # unproctected. # # For instance, my settings are: -# CI_REGISTRY_USER = carlesfernandez -# CI_REGISTRY_PASWORD = ******************** # DOCKER_HUB_USER = carlesfernandez # DOCKER_HUB_REPO = docker-gnsssdr # DOCKER_HUB_PASSWORD = ******************** @@ -223,7 +219,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$CI_REGISTRY_USER/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_ID/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 875234f8d7a7bcba59be2488259e0568887e814c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 17:51:30 +0100 Subject: [PATCH 077/145] Fix user --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ac616331..9cad16028 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_ID/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 472de0ec2e6bbadfea62c0b79f4d0779c07e3e0a Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 18:01:55 +0100 Subject: [PATCH 078/145] Fix user --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cad16028..f86527682 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\n\RUN mkdir build\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 3fa959355da619d60753a767ec59181cc66fe870 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 18:05:16 +0100 Subject: [PATCH 079/145] Fix user --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f86527682..b68e11b9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\n\RUN mkdir build\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\nRUN mkdir build\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 068b34bd19ea8ad863adedfd2983999047e941ea Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 18:14:45 +0100 Subject: [PATCH 080/145] Fix user --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b68e11b9a..6d6a331ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA\nRUN mkdir build\nRUN cd build\nRUN cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA/build && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 4b4592cfab795be7b3337c7f058ee828d94cfa37 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 18:24:20 +0100 Subject: [PATCH 081/145] Fix user --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d6a331ca..20c9e20be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA/build && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA/build && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 488f5eb3c919d186a5d876cf8633e37687f2d6d5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 23:33:29 +0100 Subject: [PATCH 082/145] Another test --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20c9e20be..d5ba9a622 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,8 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA/build && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile +# - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA/build && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile +- echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr && cd gnss-sdr && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From a50068d4841451ad65b51feb9101bdf5798902d9 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 23:35:36 +0100 Subject: [PATCH 083/145] Another test --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5ba9a622..99c00b2b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,8 +219,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build -# - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN wget https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr/repository/$CI_COMMIT_REF_NAME/archive.tar.gz\nRUN tar xvzf archive.tar.gz\nRUN ls -la\nRUN cd gnss-sdr-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA/build && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile -- echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr && cd gnss-sdr && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr && cd gnss-sdr && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 9de82b4c81eadecda3fde94523e409b762943e3b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 Feb 2018 23:44:17 +0100 Subject: [PATCH 084/145] Fix test --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99c00b2b7..c38241455 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six libxml2-dev bison flex wget && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr && cd gnss-sdr && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 618f4ce1993ca4fbc46fadd47b192c9289765607 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 17 Feb 2018 01:10:31 +0100 Subject: [PATCH 085/145] Move job to deploy stage --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c38241455..0e7a4aaf4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,9 +30,10 @@ # DOCKER_HUB_REPO = docker-gnsssdr # DOCKER_HUB_PASSWORD = ******************** # -# If you want to make changes in the source code, please branch-off from the -# 'next' branch of your forked repository and, if needed, add new jobs in this -# file at the 'deploy' and 'experiment' stages. +# If you want to make changes in the source code, branch-off from the 'next' +# branch of your forked repository and, if needed, add new jobs in this +# file at the 'deploy' and 'experiment' stages. Please do not use the next +# branch for your changes, always open a new branch from next and work there. # # Feel free to delete the docker-gnsssdr and docker-pybombs-gnsssdr jobs, # they are for developers' team only. Actually, this is their CI/CD system. @@ -213,7 +214,7 @@ docker-pybombs-gnsssdr: docker-access18: image: docker:latest - stage: build + stage: deploy services: - docker:dind script: From b249a5afc6a364fbc316cdd288a6fee96b953c73 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 17 Feb 2018 11:17:54 +0100 Subject: [PATCH 086/145] Add Coverity Scan job, set to manual --- .gitlab-ci.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e7a4aaf4..bfc57f6bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,6 +130,26 @@ ubuntu18.04: - make install +coverity-scan: + image: ubuntu:xenial + stage: build + script: + - apt-get update + - wget -O ./cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --post-data "project=$COVERITY_SCAN_USER%2Fgnss-sdr&token=$COVERITY_SCAN_TOKEN" + - wget -O coverity_tool.md5 https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_USER%2Fgnss-sdr&md5=1" + - md5sum -c coverity_tool.md5 + - tar xvzf cov-analysis-linux64.tgz + - export PATH=$PATH:$(pwd)/cov-analysis-linux64-2017.07/bin + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - cd build + - cmake .. + - cov-build --dir cov-int make -j2 + - tar cvzf gnss-sdr.tgz cov-int + - curl --form token=$COVERITY_SCAN_TOKEN --form email=$COVERITY_SCAN_EMAIL --form file=@$(pwd)/gnss-sdr.tgz --form version="0.0.9-next" --form description=" " https://scan.coverity.com/builds?project=$COVERITY_SCAN_USER%2Fgnss-sdr --progress-bar | tee -a "log_upload.txt" ; test ${PIPESTATUS[0]} -eq 0 + when: manual + allow_failure: true + + # Stage "test" run-tests: image: debian:9.3-slim From 04bcc2f8b65b891ec98e5f679af1802337bdc362 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 17 Feb 2018 12:25:17 +0100 Subject: [PATCH 087/145] Add wget to Coverity Scan job --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfc57f6bb..871de61ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,6 +135,7 @@ coverity-scan: stage: build script: - apt-get update + - apt-get install -y wget - wget -O ./cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --post-data "project=$COVERITY_SCAN_USER%2Fgnss-sdr&token=$COVERITY_SCAN_TOKEN" - wget -O coverity_tool.md5 https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_USER%2Fgnss-sdr&md5=1" - md5sum -c coverity_tool.md5 From e35f05c2bf3d6a92aea7eff58f1759a2ac86f30d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 17 Feb 2018 15:05:20 +0100 Subject: [PATCH 088/145] Remove md5 check for Coverity Scan --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 871de61ea..0a86ab4da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,8 +137,6 @@ coverity-scan: - apt-get update - apt-get install -y wget - wget -O ./cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --post-data "project=$COVERITY_SCAN_USER%2Fgnss-sdr&token=$COVERITY_SCAN_TOKEN" - - wget -O coverity_tool.md5 https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_USER%2Fgnss-sdr&md5=1" - - md5sum -c coverity_tool.md5 - tar xvzf cov-analysis-linux64.tgz - export PATH=$PATH:$(pwd)/cov-analysis-linux64-2017.07/bin - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev From cd6d579b2656261505d7d2c37501a9c4bf579e86 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 17 Feb 2018 15:39:59 +0100 Subject: [PATCH 089/145] Add curl for Coverity Scan submission --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a86ab4da..c783f8b1f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,7 +135,7 @@ coverity-scan: stage: build script: - apt-get update - - apt-get install -y wget + - apt-get install -y wget curl - wget -O ./cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --post-data "project=$COVERITY_SCAN_USER%2Fgnss-sdr&token=$COVERITY_SCAN_TOKEN" - tar xvzf cov-analysis-linux64.tgz - export PATH=$PATH:$(pwd)/cov-analysis-linux64-2017.07/bin From 01c339101b835cbd5c2ed1cfe9c9f23ff417cdaf Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 18 Feb 2018 19:53:03 +0100 Subject: [PATCH 090/145] Include representation tools in experiment container --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c783f8b1f..7b4c6e9bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -239,7 +239,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-latex-extra epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 @@ -252,8 +252,6 @@ run-access18: stage: experiment script: - apt-get update - # Grab analysis and representation tools - - apt-get install -y texlive-latex-base texlive-fonts-recommended texlive-latex-extra epstool transfig octave # Grab the data set - apt-get install -y curl - cd data From dee303883301f9f339dce2343a83c131163304dd Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 23 Feb 2018 17:56:14 +0100 Subject: [PATCH 091/145] Add Fedora and ArchLinux build jobs --- .gitlab-ci.yml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b4c6e9bf..7677a8b4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,6 +130,65 @@ ubuntu18.04: - make install +fedora26: + image: fedora:26 + stage: build + before_script: + - source ~/.bash_profile + script: + - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - cd build + - cmake .. + - make -j2 + - make check + - make install + + +fedora27: + image: fedora:27 + stage: build + before_script: + - source ~/.bash_profile + script: + - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - cd build + - cmake .. + - make -j2 + - make check + - make install + + +fedora-rawhide: + image: fedora:rawhide + stage: build + before_script: + - source ~/.bash_profile + script: + - yum install -y automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - cd build + - cmake .. + - make -j2 + - make check + - make install + allow_failure: true + + +archlinux: + image: base/devel:latest + stage: build + before_script: + - pwd + script: + - pacman -Syu + - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest + - cd build + - cmake -DENABLE_OSMOSDR=ON .. + - make -j2 + - make check + - make install + allow_failure: true + + coverity-scan: image: ubuntu:xenial stage: build From e88574255e4f5dc9f1e457d50a53a3ded228117b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 23 Feb 2018 22:20:35 +0100 Subject: [PATCH 092/145] Add CentOS --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7677a8b4b..f2fadac7c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -189,6 +189,23 @@ archlinux: allow_failure: true +centos7: + image: centos:centos7 + stage: build + before_script: + - pwd + script: + - yum install -y wget + - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + - rpm -Uvh epel-release-latest-7.noarch.rpm + - yum install -y make automake gcc gcc-c++ kernel-devel libtool cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - cd build + - cmake .. + - make -j2 + - make check + - make install + + coverity-scan: image: ubuntu:xenial stage: build From 7f87e4cc98a440e8c8badec49474ec2c49f53b5e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 00:57:12 +0100 Subject: [PATCH 093/145] Add Ubuntu 14.04 --- .gitlab-ci.yml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2fadac7c..45986c799 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,6 +67,7 @@ debian8.10: - cd build - cmake .. - make -j2 + - make check - make install @@ -79,6 +80,7 @@ debian9.3: - cd build - cmake .. - make -j2 + - make check - make install @@ -91,6 +93,7 @@ debian9.3-i386: - cd build - cmake .. - make -j2 + - make check - make install @@ -103,6 +106,26 @@ debian10: - cd build - cmake .. - make -j2 + - make check + - make install + + + +ubuntu14.04: + image: ubuntu:trusty + stage: build + script: + - apt-get update + - apt-get install -y apt-file + - apt-file update + - apt-get install -y software-properties-common + - add-apt-repository -y ppa:myriadrf/gnuradio + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libtool automake libhdf5-dev libgtest-dev + - cd build + - cmake .. + - make -j2 + - make check - make install @@ -115,6 +138,7 @@ ubuntu16.04: - cd build - cmake .. - make -j2 + - make check - make install @@ -127,6 +151,7 @@ ubuntu18.04: - cd build - cmake .. - make -j2 + - make check - make install @@ -198,7 +223,7 @@ centos7: - yum install -y wget - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - rpm -Uvh epel-release-latest-7.noarch.rpm - - yum install -y make automake gcc gcc-c++ kernel-devel libtool cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - yum install -y make automake gcc gcc-c++ kernel-devel libtool automake hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six - cd build - cmake .. - make -j2 From 45dfe6fc6f1554c85f57228eade25f03c00e9840 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 01:41:47 +0100 Subject: [PATCH 094/145] Fix Debian 8 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45986c799..586ed4d94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,7 @@ debian8.10: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - cmake .. - make -j2 @@ -121,7 +121,7 @@ ubuntu14.04: - apt-get install -y software-properties-common - add-apt-repository -y ppa:myriadrf/gnuradio - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libtool automake libhdf5-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - cmake .. - make -j2 From 406b6bd90d5612884d4387b432f122480247775e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 02:04:08 +0100 Subject: [PATCH 095/145] Fix Arch Linux --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 586ed4d94..b34f4c3ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -110,7 +110,6 @@ debian10: - make install - ubuntu14.04: image: ubuntu:trusty stage: build @@ -204,7 +203,6 @@ archlinux: before_script: - pwd script: - - pacman -Syu - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest - cd build - cmake -DENABLE_OSMOSDR=ON .. From 4c171927ec2345d7db09c08e106b6e1b4950399d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 02:08:15 +0100 Subject: [PATCH 096/145] Fix Arch Linux --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b34f4c3ad..69890db48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -203,6 +203,7 @@ archlinux: before_script: - pwd script: + - pacman -Syu - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest - cd build - cmake -DENABLE_OSMOSDR=ON .. From f766f6eff4a2a73d960d695f183b3e8c9c54a578 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 02:25:38 +0100 Subject: [PATCH 097/145] Fix Debian 8 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69890db48..eb78b242e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,7 @@ debian8.10: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev + - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - cmake .. - make -j2 From 1ed36c2394826580072b711dbf674f417023aef2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 02:50:49 +0100 Subject: [PATCH 098/145] Fix Arch Linux --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb78b242e..3f7e98249 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -203,7 +203,7 @@ archlinux: before_script: - pwd script: - - pacman -Syu + - pacman -Syu --noconfirm - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest - cd build - cmake -DENABLE_OSMOSDR=ON .. From 069f1cb1b68bb2c95de6bf97dbd757f727262383 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 03:23:55 +0100 Subject: [PATCH 099/145] Fix Debian9.3-i386 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f7e98249..a0a5dfb9e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,7 +91,7 @@ debian9.3-i386: - apt-get update - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - - cmake .. + - cmake -DENABLE_PACKAGING=ON .. - make -j2 - make check - make install From c37d10c8f7e67b9d919ae3dfff6aff70b682f9fb Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 10:20:47 +0100 Subject: [PATCH 100/145] Add gr-osmosdr-devel to Fedora packages --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0a5dfb9e..afdc793e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,9 +160,9 @@ fedora26: before_script: - source ~/.bash_profile script: - - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel - cd build - - cmake .. + - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - make check - make install @@ -174,9 +174,9 @@ fedora27: before_script: - source ~/.bash_profile script: - - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel - cd build - - cmake .. + - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - make check - make install @@ -188,9 +188,9 @@ fedora-rawhide: before_script: - source ~/.bash_profile script: - - yum install -y automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - yum install -y automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel - cd build - - cmake .. + - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - make check - make install From 81b14c31bee11b58814459f9b3345a5f73e31195 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 11:16:30 +0100 Subject: [PATCH 101/145] Add gr-osmosdr package --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afdc793e0..1790bdc11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,9 +63,9 @@ debian8.10: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev + - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - - cmake .. + - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - make check - make install @@ -102,9 +102,9 @@ debian10: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - - cmake .. + - cmake -DENABLE_PACKAGING=ON .. - make -j2 - make check - make install @@ -133,9 +133,9 @@ ubuntu16.04: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - - cmake .. + - cmake -DENABLE_PACKAGING=ON .. - make -j2 - make check - make install @@ -146,9 +146,9 @@ ubuntu18.04: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - - cmake .. + - cmake -DENABLE_PACKAGING=ON .. - make -j2 - make check - make install @@ -222,9 +222,9 @@ centos7: - yum install -y wget - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - rpm -Uvh epel-release-latest-7.noarch.rpm - - yum install -y make automake gcc gcc-c++ kernel-devel libtool automake hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six + - yum install -y make automake gcc gcc-c++ kernel-devel libtool automake hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six - cd build - - cmake .. + - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - make check - make install From 7822227888ad8adc8688d6f66b8f7cb911cbafcd Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 11:23:41 +0100 Subject: [PATCH 102/145] Add gr-osmosdr option to Coverity Scan --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1790bdc11..e953a3e7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -239,9 +239,9 @@ coverity-scan: - wget -O ./cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --post-data "project=$COVERITY_SCAN_USER%2Fgnss-sdr&token=$COVERITY_SCAN_TOKEN" - tar xvzf cov-analysis-linux64.tgz - export PATH=$PATH:$(pwd)/cov-analysis-linux64-2017.07/bin - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - - cmake .. + - cmake -DENABLE_OSMOSDR=ON .. - cov-build --dir cov-int make -j2 - tar cvzf gnss-sdr.tgz cov-int - curl --form token=$COVERITY_SCAN_TOKEN --form email=$COVERITY_SCAN_EMAIL --form file=@$(pwd)/gnss-sdr.tgz --form version="0.0.9-next" --form description=" " https://scan.coverity.com/builds?project=$COVERITY_SCAN_USER%2Fgnss-sdr --progress-bar | tee -a "log_upload.txt" ; test ${PIPESTATUS[0]} -eq 0 From d44fc6f93564a891788d6185507180e0fff483ac Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 14:34:18 +0100 Subject: [PATCH 103/145] Add system tests to the test stage --- .gitlab-ci.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e953a3e7b..771b47648 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -255,21 +255,25 @@ run-tests: stage: test script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y --no-install-recommends build-essential cmake ca-certificates git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - mkdir build-test - mkdir build64 - cd build-test - - cmake .. + - cmake -DENABLE_SYSTEM_TESTING_EXTRA=ON .. - make -j2 - - make check + # Execute Unit Tests - ../install/run_tests --gtest_output=xml - mv *.xml ../build64/ + # Execute System Tests + - ../install/position_test + - mv position_test*.txt ../build64/ - cd .. - rm -rf build-test artifacts: paths: - build64/*.xml + - build64/*.txt run-tests-i386: @@ -277,21 +281,25 @@ run-tests-i386: stage: test script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y --no-install-recommends build-essential cmake ca-certificates git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - mkdir build-test - mkdir build32 - cd build-test - - cmake -DENABLE_PACKAGING=ON .. + - cmake -DENABLE_PACKAGING=ON -DENABLE_SYSTEM_TESTING_EXTRA=ON .. - make -j2 - - make check + # Execute Unit Tests - ../install/run_tests --gtest_output=xml - mv *.xml ../build32/ + # Execute System Tests + - ../install/position_test + - mv position_test*.txt ../build32/ - cd .. - rm -rf build-test artifacts: paths: - build32/*.xml + - build32/*.txt # Stage "deploy" From 2dcdb912f41d2fce9c7c8a13ad59c81e01212836 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 16:16:47 +0100 Subject: [PATCH 104/145] Fix run-access18 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 771b47648..9acbae685 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -347,7 +347,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-latex-extra epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/$GITLAB_USER_LOGIN/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-latex-extra epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 5bd0abe8b80e0056e91b4e51d207ea74239a5b7c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 24 Feb 2018 16:33:33 +0100 Subject: [PATCH 105/145] Fix typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9acbae685..a0ac8be16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -369,7 +369,7 @@ run-access18: - md5sum -c data.md5 - cd .. # Execute the experiment (example) - - run_tests --gtest_filter==Multi* + - run_tests --gtest_filter=Multi* - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x), \"linewidth\", 2); hold on; plot (x, x, \"r\", \"linewidth\", 2); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['\leftarrow x = \pi \int_{0}^{x}e^{-t^2} dt = 0.6175']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); hh=findall(hf,\"-property\",\"FontName\"); set(hh,\"FontName\",\"Times\"); hh2=findall(hf,\"-property\",\"interpreter\"); set(hh2, \"interpreter\", \"tex\"); hh3=findall(hf,\"-property\",\"FontSize\"); set(hh3, \"FontSize\", 22); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m - octave --no-gui my_test_file.m - epspdf results.eps results.pdf From a0ad77da5547461f8dcc58e55141bf035d523c36 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 25 Feb 2018 14:46:38 +0100 Subject: [PATCH 106/145] Enable OsmoSDR where possible in build jobs --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0ac8be16..60856eb83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,9 +76,9 @@ debian9.3: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - - cmake .. + - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - make check - make install @@ -89,9 +89,9 @@ debian9.3-i386: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - - cmake -DENABLE_PACKAGING=ON .. + - cmake -DENABLE_PACKAGING=ON -DENABLE_OSMOSDR=ON .. - make -j2 - make check - make install @@ -104,7 +104,7 @@ debian10: - apt-get update - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - - cmake -DENABLE_PACKAGING=ON .. + - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - make check - make install @@ -135,7 +135,7 @@ ubuntu16.04: - apt-get update - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - - cmake -DENABLE_PACKAGING=ON .. + - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - make check - make install @@ -148,7 +148,7 @@ ubuntu18.04: - apt-get update - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - - cmake -DENABLE_PACKAGING=ON .. + - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - make check - make install From d5866c59b9b952481a774d1da9bec7aca1fe656a Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 27 Feb 2018 18:12:32 +0100 Subject: [PATCH 107/145] Add curl --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60856eb83..632965446 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -347,7 +347,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-latex-extra epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y --no-install-recommends build-essential cmake curl libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 9e9c1d83288e04266517ee6da9cee9db0f7b56a8 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 27 Feb 2018 21:06:26 +0100 Subject: [PATCH 108/145] Install recommends --- .gitlab-ci.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 632965446..6737a96ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -347,7 +347,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y --no-install-recommends build-essential cmake curl libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 @@ -362,19 +362,23 @@ run-access18: - apt-get update # Grab the data set - apt-get install -y curl - - cd data - - curl https://zenodo.org/record/1172670/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz + - mkdir -p exp-access18/data + - cd exp-access18/data + - curl https://zenodo.org/record/1184601/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz - tar xvfJ L2_signal_samples.tar.xz - - echo "2090ad3dfb3f461314252a1e6243d714 L2_signal_samples.tar.xz" > data.md5 + - echo "3a04c1eeb970776bb77f5e3b7eaff2df L2_signal_samples.tar.xz" > data.md5 - md5sum -c data.md5 - cd .. - # Execute the experiment (example) - - run_tests --gtest_filter=Multi* - - echo " x = 0:0.01:3; hf = figure (\"visible\", \"off\"); plot (x, erf (x), \"linewidth\", 2); hold on; plot (x, x, \"r\", \"linewidth\", 2); axis ([0, 3, 0, 1]); text (0.65, 0.6175, ['\leftarrow x = \pi \int_{0}^{x}e^{-t^2} dt = 0.6175']); xlabel (\"x\"); ylabel (\"erf (x)\"); title (\"erf (x) with text annotation\"); hh=findall(hf,\"-property\",\"FontName\"); set(hh,\"FontName\",\"Times\"); hh2=findall(hf,\"-property\",\"interpreter\"); set(hh2, \"interpreter\", \"tex\"); hh3=findall(hf,\"-property\",\"FontSize\"); set(hh3, \"FontSize\", 22); print (hf, \"results.eps\", \"-depsc\"); " > my_test_file.m - - octave --no-gui my_test_file.m - - epspdf results.eps results.pdf + # Execute the experiment + - cp ../src/utils/reproducibility/ieee-access18/L2-access18.conf . + - cp ../src/utils/reproducibility/ieee-access18/plot_dump.m . + - cp -r ../src/utils/matlab/libs/geoFunctions . + - gnss-sdr --c=L2-access18.conf + - octave --no-gui plot_dump.m + - epspdf Figure2.eps Figure2.pdf + - cd .. - mkdir access18 - - cp results.pdf access18/ + - cp exp-access18/*.pdf access18/ artifacts: paths: From 0bddcd6fdfe0be74b245685ec9931731dbd22e9e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 27 Feb 2018 21:42:18 +0100 Subject: [PATCH 109/145] Add glog-devel and gflags-devel to CentOS --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6737a96ff..e5775fd8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,7 +222,7 @@ centos7: - yum install -y wget - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - rpm -Uvh epel-release-latest-7.noarch.rpm - - yum install -y make automake gcc gcc-c++ kernel-devel libtool automake hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six + - yum install -y make automake gcc gcc-c++ kernel-devel libtool automake hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-develgnutls-devel openssl-devel python-mako python-six - cd build - cmake -DENABLE_OSMOSDR=ON .. - make -j2 From ba993c965d1554d778231a7e7fd021f0e8449600 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 28 Feb 2018 13:21:00 +0100 Subject: [PATCH 110/145] Add epspdf to access18 image --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5775fd8c..63d4a52a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -347,7 +347,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-fonts-utils epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 @@ -361,7 +361,6 @@ run-access18: script: - apt-get update # Grab the data set - - apt-get install -y curl - mkdir -p exp-access18/data - cd exp-access18/data - curl https://zenodo.org/record/1184601/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz From 6ce5b83d47970fe1baeb356fc501bff79264ac31 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 28 Feb 2018 14:33:53 +0100 Subject: [PATCH 111/145] Fix Cent OS --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63d4a52a2..41aea2d7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,7 +222,7 @@ centos7: - yum install -y wget - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - rpm -Uvh epel-release-latest-7.noarch.rpm - - yum install -y make automake gcc gcc-c++ kernel-devel libtool automake hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-develgnutls-devel openssl-devel python-mako python-six + - yum install -y make automake gcc gcc-c++ kernel-devel libtool automake hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six - cd build - cmake -DENABLE_OSMOSDR=ON .. - make -j2 From a984f03ee57942d13ce31e7c9d4a9b08ebadfcfa Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 28 Feb 2018 15:07:42 +0100 Subject: [PATCH 112/145] Allow Ubuntu 18.04 failure --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41aea2d7d..139bf3a7c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,6 +152,7 @@ ubuntu18.04: - make -j2 - make check - make install + allow_failure: true fedora26: From 33d3b460ef468bfa92ca3a3528bb53ebf290c37e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 28 Feb 2018 16:20:38 +0100 Subject: [PATCH 113/145] Allow Ubuntu 16.04 failure --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 139bf3a7c..a7cf36e2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -139,6 +139,7 @@ ubuntu16.04: - make -j2 - make check - make install + allow_failure: true ubuntu18.04: From fd0730d06107534d675adf45aa62e80cde774f7f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 28 Feb 2018 19:07:30 +0100 Subject: [PATCH 114/145] Fix typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7cf36e2c..be1a25acd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -349,7 +349,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-fonts-utils epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-font-utils epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 519a502def15ec6296e96c460b2a2ab65f47e163 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 1 Mar 2018 10:23:55 +0100 Subject: [PATCH 115/145] More fixes --- .gitlab-ci.yml | 4 ++-- .../{ieee-access => ieee-access18}/L2-access18.conf | 0 .../reproducibility/{ieee-access => ieee-access18}/README.md | 0 .../{ieee-access => ieee-access18}/plot_dump.m | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename src/utils/reproducibility/{ieee-access => ieee-access18}/L2-access18.conf (100%) rename src/utils/reproducibility/{ieee-access => ieee-access18}/README.md (100%) rename src/utils/reproducibility/{ieee-access => ieee-access18}/plot_dump.m (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60856eb83..8b974ae97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,7 +137,7 @@ ubuntu16.04: - cd build - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - - make check + # - make check - make install @@ -150,7 +150,7 @@ ubuntu18.04: - cd build - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - - make check + # - make check - make install diff --git a/src/utils/reproducibility/ieee-access/L2-access18.conf b/src/utils/reproducibility/ieee-access18/L2-access18.conf similarity index 100% rename from src/utils/reproducibility/ieee-access/L2-access18.conf rename to src/utils/reproducibility/ieee-access18/L2-access18.conf diff --git a/src/utils/reproducibility/ieee-access/README.md b/src/utils/reproducibility/ieee-access18/README.md similarity index 100% rename from src/utils/reproducibility/ieee-access/README.md rename to src/utils/reproducibility/ieee-access18/README.md diff --git a/src/utils/reproducibility/ieee-access/plot_dump.m b/src/utils/reproducibility/ieee-access18/plot_dump.m similarity index 100% rename from src/utils/reproducibility/ieee-access/plot_dump.m rename to src/utils/reproducibility/ieee-access18/plot_dump.m From a0d0e0b7ba009c4876c9b108122ed8f7c28c1e58 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 1 Mar 2018 12:35:22 +0100 Subject: [PATCH 116/145] Add texlive-pictures package for epspdf --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8feb662f0..90c685d11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -349,7 +349,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-font-utils epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-font-utils texlive-pictures epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From cb50d218d482dabe56181d9890ae4c3e333fa238 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 1 Mar 2018 15:17:49 +0100 Subject: [PATCH 117/145] Enable make check in Ubuntu 16.04 and 18.04 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90c685d11..c008c3f58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,7 +137,7 @@ ubuntu16.04: - cd build - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - # - make check + - make check - make install allow_failure: true @@ -151,7 +151,7 @@ ubuntu18.04: - cd build - cmake -DENABLE_OSMOSDR=ON .. - make -j2 - # - make check + - make check - make install allow_failure: true From 95d2a14390cc095a098bb1582637797cb3ed6460 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 1 Mar 2018 17:37:07 +0100 Subject: [PATCH 118/145] Ubuntu 16.04 build is mandatory --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c008c3f58..60fa5f626 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -139,7 +139,6 @@ ubuntu16.04: - make -j2 - make check - make install - allow_failure: true ubuntu18.04: From 49408492fb208c757cbace8149633a8184216fcd Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 1 Mar 2018 22:23:27 +0100 Subject: [PATCH 119/145] Remove repeated package --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60fa5f626..95b054f44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,7 @@ centos7: - yum install -y wget - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - rpm -Uvh epel-release-latest-7.noarch.rpm - - yum install -y make automake gcc gcc-c++ kernel-devel libtool automake hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six + - yum install -y make automake gcc gcc-c++ kernel-devel libtool hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six - cd build - cmake -DENABLE_OSMOSDR=ON .. - make -j2 From 01f8cec612046557ab4bdf0e79d62c6831d4312a Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 2 Mar 2018 09:58:48 +0100 Subject: [PATCH 120/145] Accelerate builds by detecting number of processors --- .gitlab-ci.yml | 56 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95b054f44..4ab84a2f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,7 +66,9 @@ debian8.10: - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - cmake -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install @@ -79,7 +81,9 @@ debian9.3: - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - cmake -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install @@ -92,7 +96,9 @@ debian9.3-i386: - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - cmake -DENABLE_PACKAGING=ON -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install @@ -105,7 +111,9 @@ debian10: - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - cmake -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install @@ -123,7 +131,9 @@ ubuntu14.04: - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - cmake .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install @@ -136,7 +146,9 @@ ubuntu16.04: - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install @@ -149,7 +161,9 @@ ubuntu18.04: - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - cmake -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install allow_failure: true @@ -164,7 +178,9 @@ fedora26: - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install @@ -178,7 +194,9 @@ fedora27: - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install @@ -192,7 +210,9 @@ fedora-rawhide: - yum install -y automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install allow_failure: true @@ -208,7 +228,9 @@ archlinux: - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest - cd build - cmake -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install allow_failure: true @@ -226,7 +248,9 @@ centos7: - yum install -y make automake gcc gcc-c++ kernel-devel libtool hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six - cd build - cmake -DENABLE_OSMOSDR=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) - make check - make install @@ -261,7 +285,9 @@ run-tests: - mkdir build64 - cd build-test - cmake -DENABLE_SYSTEM_TESTING_EXTRA=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) # Execute Unit Tests - ../install/run_tests --gtest_output=xml - mv *.xml ../build64/ @@ -287,7 +313,9 @@ run-tests-i386: - mkdir build32 - cd build-test - cmake -DENABLE_PACKAGING=ON -DENABLE_SYSTEM_TESTING_EXTRA=ON .. - - make -j2 + - grep -c ^processor /proc/cpuinfo + - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) # Execute Unit Tests - ../install/run_tests --gtest_output=xml - mv *.xml ../build32/ From f13e41f42d1986dfdf51f87f51910cf846e8dd32 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 2 Mar 2018 10:36:22 +0100 Subject: [PATCH 121/145] Accelerate builds by detecting number of processors --- .gitlab-ci.yml | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ab84a2f5..474d38cf0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,8 +66,7 @@ debian8.10: - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - cmake -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -81,8 +80,7 @@ debian9.3: - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - cmake -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -96,8 +94,7 @@ debian9.3-i386: - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - cmake -DENABLE_PACKAGING=ON -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -111,8 +108,7 @@ debian10: - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - cmake -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -131,8 +127,7 @@ ubuntu14.04: - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - cmake .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -146,8 +141,7 @@ ubuntu16.04: - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -161,8 +155,7 @@ ubuntu18.04: - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - cmake -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -178,8 +171,7 @@ fedora26: - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -194,8 +186,7 @@ fedora27: - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -210,8 +201,7 @@ fedora-rawhide: - yum install -y automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -228,8 +218,7 @@ archlinux: - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest - cd build - cmake -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -248,8 +237,7 @@ centos7: - yum install -y make automake gcc gcc-c++ kernel-devel libtool hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six - cd build - cmake -DENABLE_OSMOSDR=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check - make install @@ -285,8 +273,7 @@ run-tests: - mkdir build64 - cd build-test - cmake -DENABLE_SYSTEM_TESTING_EXTRA=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) # Execute Unit Tests - ../install/run_tests --gtest_output=xml @@ -313,8 +300,7 @@ run-tests-i386: - mkdir build32 - cd build-test - cmake -DENABLE_PACKAGING=ON -DENABLE_SYSTEM_TESTING_EXTRA=ON .. - - grep -c ^processor /proc/cpuinfo - - export NPROC=$(grep -c ^processor /proc/cpuinfo) + - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) # Execute Unit Tests - ../install/run_tests --gtest_output=xml From 0fc1aff61c0a4f54aae6049e6a1825cff496844f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 2 Mar 2018 10:42:57 +0100 Subject: [PATCH 122/145] Remove gnutls-devel --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 474d38cf0..3994f7ae4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -168,7 +168,7 @@ fedora26: before_script: - source ~/.bash_profile script: - - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) @@ -183,7 +183,7 @@ fedora27: before_script: - source ~/.bash_profile script: - - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) @@ -198,7 +198,7 @@ fedora-rawhide: before_script: - source ~/.bash_profile script: - - yum install -y automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel + - yum install -y automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) @@ -234,7 +234,7 @@ centos7: - yum install -y wget - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - rpm -Uvh epel-release-latest-7.noarch.rpm - - yum install -y make automake gcc gcc-c++ kernel-devel libtool hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six + - yum install -y make automake gcc gcc-c++ kernel-devel libtool hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel openssl-devel python-mako python-six - cd build - cmake -DENABLE_OSMOSDR=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) From 010ede8007d6d2d1d56648073ce1041c0fd7652d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 2 Mar 2018 11:34:21 +0100 Subject: [PATCH 123/145] Allow failure in builds that depend on SourceForge --- .gitlab-ci.yml | 129 +++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 63 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3994f7ae4..979f2643f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,6 +58,42 @@ stages: # Stage "build" +archlinux: + image: base/devel:latest + stage: build + before_script: + - pwd + script: + - pacman -Syu --noconfirm + - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest + - cd build + - cmake -DENABLE_OSMOSDR=ON .. + - NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) + - make check + - make install + allow_failure: true + + +centos7: + image: centos:centos7 + stage: build + before_script: + - pwd + script: + - yum install -y wget + - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + - rpm -Uvh epel-release-latest-7.noarch.rpm + - yum install -y make automake gcc gcc-c++ kernel-devel libtool hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel openssl-devel python-mako python-six + - cd build + - cmake -DENABLE_OSMOSDR=ON .. + - NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) + - make check + - make install + allow_failure: true + + debian8.10: image: debian:8.10-slim stage: build @@ -70,6 +106,7 @@ debian8.10: - make -j$(($NPROC+1)) - make check - make install + allow_failure: true debian9.3: @@ -114,54 +151,6 @@ debian10: - make install -ubuntu14.04: - image: ubuntu:trusty - stage: build - script: - - apt-get update - - apt-get install -y apt-file - - apt-file update - - apt-get install -y software-properties-common - - add-apt-repository -y ppa:myriadrf/gnuradio - - apt-get update - - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - - cd build - - cmake .. - - NPROC=$(grep -c ^processor /proc/cpuinfo) - - make -j$(($NPROC+1)) - - make check - - make install - - -ubuntu16.04: - image: ubuntu:xenial - stage: build - script: - - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - - cd build - - cmake -DENABLE_OSMOSDR=ON .. - - NPROC=$(grep -c ^processor /proc/cpuinfo) - - make -j$(($NPROC+1)) - - make check - - make install - - -ubuntu18.04: - image: ubuntu:bionic - stage: build - script: - - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - - cd build - - cmake -DENABLE_OSMOSDR=ON .. - - NPROC=$(grep -c ^processor /proc/cpuinfo) - - make -j$(($NPROC+1)) - - make check - - make install - allow_failure: true - - fedora26: image: fedora:26 stage: build @@ -208,16 +197,19 @@ fedora-rawhide: allow_failure: true -archlinux: - image: base/devel:latest +ubuntu14.04: + image: ubuntu:trusty stage: build - before_script: - - pwd script: - - pacman -Syu --noconfirm - - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest + - apt-get update + - apt-get install -y apt-file + - apt-file update + - apt-get install -y software-properties-common + - add-apt-repository -y ppa:myriadrf/gnuradio + - apt-get update + - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -225,16 +217,12 @@ archlinux: allow_failure: true -centos7: - image: centos:centos7 +ubuntu16.04: + image: ubuntu:xenial stage: build - before_script: - - pwd script: - - yum install -y wget - - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - - rpm -Uvh epel-release-latest-7.noarch.rpm - - yum install -y make automake gcc gcc-c++ kernel-devel libtool hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel openssl-devel python-mako python-six + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake -DENABLE_OSMOSDR=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) @@ -243,6 +231,21 @@ centos7: - make install +ubuntu18.04: + image: ubuntu:bionic + stage: build + script: + - apt-get update + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - cd build + - cmake -DENABLE_OSMOSDR=ON .. + - NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) + - make check + - make install + allow_failure: true + + coverity-scan: image: ubuntu:xenial stage: build From 05c17dcde3c28f01c3c7035d21e3284ba5a4b96e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 2 Mar 2018 12:07:34 +0100 Subject: [PATCH 124/145] Accelerate building of access18 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 979f2643f..1afe5f78f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -365,7 +365,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-font-utils texlive-pictures epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && make -j2 && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-font-utils texlive-pictures epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && NPROC=$(grep -c ^processor /proc/cpuinfo) && make -j$(($NPROC+1)) && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From d1a0f633b68fa60bef8716eda155f00b776c00be Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 4 Mar 2018 13:39:13 +0100 Subject: [PATCH 125/145] Update rawhide without gpg check --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1afe5f78f..e207dce2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -187,6 +187,7 @@ fedora-rawhide: before_script: - source ~/.bash_profile script: + - dnf upgrade -y --nogpgcheck - yum install -y automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. From 5b3cd1c8f215fbd6a8e5759d9b312ce9dde6ff99 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 5 Mar 2018 11:21:00 +0100 Subject: [PATCH 126/145] Add crosscompile job --- .gitlab-ci.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e207dce2c..4309e4072 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,6 +94,25 @@ centos7: allow_failure: true +crosscompile: + image: ubuntu:xenial + stage: build + script: + - apt-get update + - apt-get install -y build-essential xz-utils curl + - curl https://sites.cttc.es/gnss_files/SDK/Rocko/oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh --output oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh + - echo "3a59b721a1b018ce445366ba859a5988 oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh" > sdk.md5 + - md5sum -c sdk.md5 + - chmod +x ./oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh + - sh ./oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh -y + - . /usr/local/oecore-x86_64/environment-setup-armv7ahf-neon-oe-linux-gnueabi + - cd build + - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchains/oe-sdk_cross.cmake -DCMAKE_INSTALL_PREFIX=/usr .. + - make + - make install DESTDIR=/usr/local/oecore-x86_64/sysroots/armv7ahf-neon-oe-linux-gnueabi/ + allow_failure: true + + debian8.10: image: debian:8.10-slim stage: build From 61b7f4f8418189823455775800a5face62d283d5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 5 Mar 2018 11:44:53 +0100 Subject: [PATCH 127/145] Add Yocto dependencies --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4309e4072..421abea95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,7 +99,7 @@ crosscompile: stage: build script: - apt-get update - - apt-get install -y build-essential xz-utils curl + - apt-get install -y build-essential xz-utils curl gawk wget git-core diffstat unzip texinfo gcc-multilib chrpath socat cpio python python3 python3-pip python3-pexpect debianutils iputils-ping - curl https://sites.cttc.es/gnss_files/SDK/Rocko/oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh --output oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh - echo "3a59b721a1b018ce445366ba859a5988 oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh" > sdk.md5 - md5sum -c sdk.md5 From 29f491dca55c6fecb5d696203bcabd340981da2c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 6 Mar 2018 15:56:06 +0100 Subject: [PATCH 128/145] Update Rocko image --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 421abea95..e84ef3676 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,13 +101,13 @@ crosscompile: - apt-get update - apt-get install -y build-essential xz-utils curl gawk wget git-core diffstat unzip texinfo gcc-multilib chrpath socat cpio python python3 python3-pip python3-pexpect debianutils iputils-ping - curl https://sites.cttc.es/gnss_files/SDK/Rocko/oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh --output oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh - - echo "3a59b721a1b018ce445366ba859a5988 oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh" > sdk.md5 + - echo "d3c3d5f909c1ca81435108a3cfc4227b oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh" > sdk.md5 - md5sum -c sdk.md5 - chmod +x ./oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh - sh ./oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh -y - . /usr/local/oecore-x86_64/environment-setup-armv7ahf-neon-oe-linux-gnueabi - cd build - - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchains/oe-sdk_cross.cmake -DCMAKE_INSTALL_PREFIX=/usr .. + - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchains/oe-sdk_cross.cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_FMCOMMS2=ON .. - make - make install DESTDIR=/usr/local/oecore-x86_64/sysroots/armv7ahf-neon-oe-linux-gnueabi/ allow_failure: true From 681158e199d962dbe812eed2dfa88a658ed120ce Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Mar 2018 11:58:45 +0100 Subject: [PATCH 129/145] Add OpenSUSE --- .gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e84ef3676..e7e338785 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,6 +217,40 @@ fedora-rawhide: allow_failure: true +opensuse42.3: + image: opensuse:42.3 + stage: build + before_script: + - source ~/.bash_profile + script: + - zypper -n up + - zypper -n install cmake git gcc-c++ boost-devel log4cpp-devel gnuradio-devel armadillo-devel libtool automake hdf5-devel openssl-devel python-Mako python-six + - cd build + - cmake -DENABLE_PACKAGING=ON .. + - NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) + - make check + - make install + allow_failure: true + + +opensuse-tumbleweed: + image: opensuse:tumbleweed + stage: build + before_script: + - source ~/.bash_profile + script: + - zypper -n up + - zypper -n install cmake git gcc-c++ boost-devel libboost_system-devel libboost_filesystem-devel libboost_date_time-devel libboost_thread-devel libboost_chrono-devel libboost_serialization-devel log4cpp-devel gtest gnuradio-devel armadillo-devel libtool automake hdf5-devel openssl-devel python-Mako python-six + - cd build + - cmake .. + - NPROC=$(grep -c ^processor /proc/cpuinfo) + - make -j$(($NPROC+1)) + - make check + - make install + allow_failure: true + + ubuntu14.04: image: ubuntu:trusty stage: build From ade2cc01e9065a5de54e9cbb650fd21e625fcaae Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Mar 2018 13:01:49 +0100 Subject: [PATCH 130/145] Fix OpenSUSE --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7e338785..0c6cf6157 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,7 +221,7 @@ opensuse42.3: image: opensuse:42.3 stage: build before_script: - - source ~/.bash_profile + - pwd script: - zypper -n up - zypper -n install cmake git gcc-c++ boost-devel log4cpp-devel gnuradio-devel armadillo-devel libtool automake hdf5-devel openssl-devel python-Mako python-six @@ -238,7 +238,7 @@ opensuse-tumbleweed: image: opensuse:tumbleweed stage: build before_script: - - source ~/.bash_profile + - pwd script: - zypper -n up - zypper -n install cmake git gcc-c++ boost-devel libboost_system-devel libboost_filesystem-devel libboost_date_time-devel libboost_thread-devel libboost_chrono-devel libboost_serialization-devel log4cpp-devel gtest gnuradio-devel armadillo-devel libtool automake hdf5-devel openssl-devel python-Mako python-six From 3ac2860f333f3e814fb1d62e4b2920b7da47ef19 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Mar 2018 18:37:52 +0100 Subject: [PATCH 131/145] Fix Rawhide --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c6cf6157..ff71cddbb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -207,7 +207,7 @@ fedora-rawhide: - source ~/.bash_profile script: - dnf upgrade -y --nogpgcheck - - yum install -y automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel + - yum install -y automake gcc gcc-c++ kernel-devel make cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel - cd build - cmake -DENABLE_OSMOSDR=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) From 9b63f038c7d60a16f57853699b1f65eded4ff1ff Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Mar 2018 18:38:57 +0100 Subject: [PATCH 132/145] Upgrade local Matio to 1.15.12 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09cf1a452..d8350eef1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,7 +330,7 @@ set(GNSSSDR_ARMADILLO_LOCAL_VERSION "unstable") set(GNSSSDR_GTEST_LOCAL_VERSION "1.8.0") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "2.10") -set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.11") +set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.12") From 16c5d5aad03e941b12bf357a7106675a1c771565 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 11 Mar 2018 20:02:44 +0100 Subject: [PATCH 133/145] Fix Ubuntu 14.04 --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff71cddbb..20a01fb2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -260,6 +260,8 @@ ubuntu14.04: - apt-file update - apt-get install -y software-properties-common - add-apt-repository -y ppa:myriadrf/gnuradio + - add-apt-repository -y ppa:myriadrf/uhd + - add-apt-repository -y ppa:ettusresearch/drivers - apt-get update - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build From 812f628a221603752d687e607a28fbe0dc115041 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 11 Mar 2018 20:40:14 +0100 Subject: [PATCH 134/145] Fix syslog-ng warning --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20a01fb2d..96bb1a0c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -421,7 +421,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:0.10.0\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-font-utils texlive-pictures epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && NPROC=$(grep -c ^processor /proc/cpuinfo) && make -j$(($NPROC+1)) && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:master\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-font-utils texlive-pictures epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && NPROC=$(grep -c ^processor /proc/cpuinfo) && make -j$(($NPROC+1)) && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From 3dead75c2015bc90b56cb626c374f706a5ed7e02 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 12 Mar 2018 00:50:50 +0100 Subject: [PATCH 135/145] Fix Ubuntu 14.04 --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96bb1a0c7..c98f52b99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -260,8 +260,7 @@ ubuntu14.04: - apt-file update - apt-get install -y software-properties-common - add-apt-repository -y ppa:myriadrf/gnuradio - - add-apt-repository -y ppa:myriadrf/uhd - - add-apt-repository -y ppa:ettusresearch/drivers + - add-apt-repository -y ppa:myriadrf/drivers - apt-get update - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build From cff55496db2302672e3062c888a160aec7f5fb73 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 3 Apr 2018 21:13:59 +0200 Subject: [PATCH 136/145] Allow debian10 to fail --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c98f52b99..3e1992a58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -168,6 +168,7 @@ debian10: - make -j$(($NPROC+1)) - make check - make install + allow_failure: true fedora26: From ba07f5ef850c1d9026ea395531e7a2010f8fd210 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 4 Apr 2018 00:00:58 +0200 Subject: [PATCH 137/145] Fix Ubuntu 14.04 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e1992a58..2a82c9fba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -263,7 +263,7 @@ ubuntu14.04: - add-apt-repository -y ppa:myriadrf/gnuradio - add-apt-repository -y ppa:myriadrf/drivers - apt-get update - - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev + - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libgfortran-4.7-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - cmake .. - NPROC=$(grep -c ^processor /proc/cpuinfo) From 59215870c631702297f71ae8e311a878205be01c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 4 Apr 2018 00:07:02 +0200 Subject: [PATCH 138/145] Fix debian8.10 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a82c9fba..92d0515e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,7 +118,7 @@ debian8.10: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev + - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libgfortran-4.9-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - cmake -DENABLE_OSMOSDR=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) From 2168d1a56bab63e00551afe35e7717f63afd649b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 5 May 2018 13:23:14 +0200 Subject: [PATCH 139/145] Return to libgtest-dev --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92d0515e0..a029d25f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -161,7 +161,8 @@ debian10: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get upgrade -y + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake -DENABLE_OSMOSDR=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) From 9a94893e2ad1df0548cd14a1ac8d2415e313df8c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 16 May 2018 19:56:57 +0200 Subject: [PATCH 140/145] Add libpcap and the UDP source --- .gitlab-ci.yml | 64 +++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a029d25f3..df3037f3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,9 +65,9 @@ archlinux: - pwd script: - pacman -Syu --noconfirm - - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest + - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr libpcap blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -84,9 +84,9 @@ centos7: - yum install -y wget - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - rpm -Uvh epel-release-latest-7.noarch.rpm - - yum install -y make automake gcc gcc-c++ kernel-devel libtool hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel openssl-devel python-mako python-six + - yum install -y make automake gcc gcc-c++ kernel-devel libtool hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel libpcap-devel blas-devel lapack-devel armadillo-devel openssl-devel python-mako python-six - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -107,7 +107,7 @@ crosscompile: - sh ./oecore-x86_64-armv7ahf-neon-toolchain-nodistro.0.sh -y - . /usr/local/oecore-x86_64/environment-setup-armv7ahf-neon-oe-linux-gnueabi - cd build - - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchains/oe-sdk_cross.cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_FMCOMMS2=ON .. + - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchains/oe-sdk_cross.cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_FMCOMMS2=ON -DENABLE_AD9361=ON -DENABLE_RAW_UDP=ON .. - make - make install DESTDIR=/usr/local/oecore-x86_64/sysroots/armv7ahf-neon-oe-linux-gnueabi/ allow_failure: true @@ -118,9 +118,9 @@ debian8.10: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libgfortran-4.9-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev + - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libpcap-dev libblas-dev liblapack-dev libgfortran-4.9-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -133,9 +133,9 @@ debian9.3: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -147,9 +147,9 @@ debian9.3-i386: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - - cmake -DENABLE_PACKAGING=ON -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_PACKAGING=ON -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -162,9 +162,9 @@ debian10: script: - apt-get update - apt-get upgrade -y - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -178,9 +178,9 @@ fedora26: before_script: - source ~/.bash_profile script: - - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel + - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel libpcap-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -193,9 +193,9 @@ fedora27: before_script: - source ~/.bash_profile script: - - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel + - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel libpcap-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -209,9 +209,9 @@ fedora-rawhide: - source ~/.bash_profile script: - dnf upgrade -y --nogpgcheck - - yum install -y automake gcc gcc-c++ kernel-devel make cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel + - yum install -y automake gcc gcc-c++ kernel-devel make cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel libpcap-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel openssl-devel python-mako python-six matio-devel - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -226,9 +226,9 @@ opensuse42.3: - pwd script: - zypper -n up - - zypper -n install cmake git gcc-c++ boost-devel log4cpp-devel gnuradio-devel armadillo-devel libtool automake hdf5-devel openssl-devel python-Mako python-six + - zypper -n install cmake git gcc-c++ boost-devel log4cpp-devel gnuradio-devel libpcap-devel armadillo-devel libtool automake hdf5-devel openssl-devel python-Mako python-six - cd build - - cmake -DENABLE_PACKAGING=ON .. + - cmake -DENABLE_PACKAGING=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -243,9 +243,9 @@ opensuse-tumbleweed: - pwd script: - zypper -n up - - zypper -n install cmake git gcc-c++ boost-devel libboost_system-devel libboost_filesystem-devel libboost_date_time-devel libboost_thread-devel libboost_chrono-devel libboost_serialization-devel log4cpp-devel gtest gnuradio-devel armadillo-devel libtool automake hdf5-devel openssl-devel python-Mako python-six + - zypper -n install cmake git gcc-c++ boost-devel libboost_system-devel libboost_filesystem-devel libboost_date_time-devel libboost_thread-devel libboost_chrono-devel libboost_serialization-devel log4cpp-devel gtest gnuradio-devel libpcap-devel armadillo-devel libtool automake hdf5-devel openssl-devel python-Mako python-six - cd build - - cmake .. + - cmake -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -264,9 +264,9 @@ ubuntu14.04: - add-apt-repository -y ppa:myriadrf/gnuradio - add-apt-repository -y ppa:myriadrf/drivers - apt-get update - - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libgfortran-4.7-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev + - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libpcap-dev libblas-dev liblapack-dev libgfortran-4.7-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - cd build - - cmake .. + - cmake -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -279,9 +279,9 @@ ubuntu16.04: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -293,9 +293,9 @@ ubuntu18.04: stage: build script: - apt-get update - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check @@ -312,9 +312,9 @@ coverity-scan: - wget -O ./cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --post-data "project=$COVERITY_SCAN_USER%2Fgnss-sdr&token=$COVERITY_SCAN_TOKEN" - tar xvzf cov-analysis-linux64.tgz - export PATH=$PATH:$(pwd)/cov-analysis-linux64-2017.07/bin - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - - cmake -DENABLE_OSMOSDR=ON .. + - cmake -DENABLE_OSMOSDR=ON -ENABLE_RAW_UDP=ON .. - cov-build --dir cov-int make -j2 - tar cvzf gnss-sdr.tgz cov-int - curl --form token=$COVERITY_SCAN_TOKEN --form email=$COVERITY_SCAN_EMAIL --form file=@$(pwd)/gnss-sdr.tgz --form version="0.0.9-next" --form description=" " https://scan.coverity.com/builds?project=$COVERITY_SCAN_USER%2Fgnss-sdr --progress-bar | tee -a "log_upload.txt" ; test ${PIPESTATUS[0]} -eq 0 @@ -422,7 +422,7 @@ docker-access18: script: - mkdir docker-build - cd docker-build - - echo -e "FROM phusion/baseimage:master\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev libuhd-dev git ca-certificates gnuradio-dev gr-osmosdr python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-font-utils texlive-pictures epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && NPROC=$(grep -c ^processor /proc/cpuinfo) && make -j$(($NPROC+1)) && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - echo -e "FROM phusion/baseimage:master\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev git ca-certificates gnuradio-dev python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-font-utils texlive-pictures epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout $CI_COMMIT_SHA && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && NPROC=$(grep -c ^processor /proc/cpuinfo) && make -j$(($NPROC+1)) && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 From bff0702defdde993cf67ff68e4255f60f9910311 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 19 May 2018 21:46:35 +0200 Subject: [PATCH 141/145] Add gr-iio in Debian Buster --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df3037f3c..db09c6c0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -162,9 +162,9 @@ debian10: script: - apt-get update - apt-get upgrade -y - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr gr-iio libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. + - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON -DENABLE_FMCOMMS2=ON -DENABLE_AD9361=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) - make -j$(($NPROC+1)) - make check From f66f0b88e7036daa3674adc606d865549507eca4 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 20 May 2018 00:03:31 +0200 Subject: [PATCH 142/145] Add libiio-dev to Debian Buster --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db09c6c0a..254a14769 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -162,7 +162,7 @@ debian10: script: - apt-get update - apt-get upgrade -y - - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr gr-iio libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev + - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libiio-dev gr-iio libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev - cd build - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON -DENABLE_FMCOMMS2=ON -DENABLE_AD9361=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) From 4191b92a5a8abce999ae9be83a86ad299556f0c9 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 15 Jun 2018 20:06:49 +0200 Subject: [PATCH 143/145] Remove gnutls from ArchLinux list of dependencies --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 254a14769..8e538818f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,7 +65,7 @@ archlinux: - pwd script: - pacman -Syu --noconfirm - - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr libpcap blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest + - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr libpcap blas lapack gflags google-glog openssl python2-mako python2-six libmatio gtest - cd build - cmake -DENABLE_OSMOSDR=ON -DENABLE_RAW_UDP=ON .. - NPROC=$(grep -c ^processor /proc/cpuinfo) From f8df0786bd2578e9ae68053725746e54b57bb95d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 15 Jun 2018 21:24:32 +0200 Subject: [PATCH 144/145] Revert "Replace deprecated boost/math/common_factor_rt.hpp header by boost/integer/common_factor_rt.hpp" This reverts commit f3b07090e2bc157641163b16b731f93709877660. --- .../PVT/gnuradio_blocks/rtklib_pvt_cc.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc index 8a5ee4e8a..1fc243cb3 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc @@ -30,9 +30,9 @@ #include "rtklib_pvt_cc.h" #include +#include #include #include -#include #include #include #include @@ -304,7 +304,7 @@ rtklib_pvt_cc::rtklib_pvt_cc(unsigned int nchannels, } else { - d_rtcm_MT1019_rate_ms = boost::integer::lcm(5000, d_output_rate_ms); // default value if not set + d_rtcm_MT1019_rate_ms = boost::math::lcm(5000, d_output_rate_ms); // default value if not set } if (rtcm_msg_rate_ms.find(1020) != rtcm_msg_rate_ms.end()) { @@ -312,7 +312,7 @@ rtklib_pvt_cc::rtklib_pvt_cc(unsigned int nchannels, } else { - d_rtcm_MT1020_rate_ms = boost::integer::lcm(5000, d_output_rate_ms); // default value if not set + d_rtcm_MT1020_rate_ms = boost::math::lcm(5000, d_output_rate_ms); // default value if not set } if (rtcm_msg_rate_ms.find(1045) != rtcm_msg_rate_ms.end()) { @@ -320,7 +320,7 @@ rtklib_pvt_cc::rtklib_pvt_cc(unsigned int nchannels, } else { - d_rtcm_MT1045_rate_ms = boost::integer::lcm(5000, d_output_rate_ms); // default value if not set + d_rtcm_MT1045_rate_ms = boost::math::lcm(5000, d_output_rate_ms); // default value if not set } if (rtcm_msg_rate_ms.find(1077) != rtcm_msg_rate_ms.end()) // whatever between 1071 and 1077 { @@ -328,7 +328,7 @@ rtklib_pvt_cc::rtklib_pvt_cc(unsigned int nchannels, } else { - d_rtcm_MT1077_rate_ms = boost::integer::lcm(1000, d_output_rate_ms); // default value if not set + d_rtcm_MT1077_rate_ms = boost::math::lcm(1000, d_output_rate_ms); // default value if not set } if (rtcm_msg_rate_ms.find(1087) != rtcm_msg_rate_ms.end()) // whatever between 1081 and 1087 { @@ -336,7 +336,7 @@ rtklib_pvt_cc::rtklib_pvt_cc(unsigned int nchannels, } else { - d_rtcm_MT1087_rate_ms = boost::integer::lcm(1000, d_output_rate_ms); // default value if not set + d_rtcm_MT1087_rate_ms = boost::math::lcm(1000, d_output_rate_ms); // default value if not set } if (rtcm_msg_rate_ms.find(1097) != rtcm_msg_rate_ms.end()) // whatever between 1091 and 1097 { @@ -345,8 +345,8 @@ rtklib_pvt_cc::rtklib_pvt_cc(unsigned int nchannels, } else { - d_rtcm_MT1097_rate_ms = boost::integer::lcm(1000, d_output_rate_ms); // default value if not set - d_rtcm_MSM_rate_ms = boost::integer::lcm(1000, d_output_rate_ms); // default value if not set + d_rtcm_MT1097_rate_ms = boost::math::lcm(1000, d_output_rate_ms); // default value if not set + d_rtcm_MSM_rate_ms = boost::math::lcm(1000, d_output_rate_ms); // default value if not set } b_rtcm_writing_started = false; From aae0993aa5f4be03c8964d4236f6d1f2f82ec200 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 16 Jun 2018 00:31:12 +0200 Subject: [PATCH 145/145] Preparing release 0.0.10 tagging for Docker images --- .gitlab-ci.yml | 70 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e538818f..d86c3a7d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -343,7 +343,6 @@ run-tests: - mv position_test*.txt ../build64/ - cd .. - rm -rf build-test - artifacts: paths: - build64/*.xml @@ -370,7 +369,6 @@ run-tests-i386: - mv position_test*.txt ../build32/ - cd .. - rm -rf build-test - artifacts: paths: - build32/*.xml @@ -396,6 +394,25 @@ docker-gnsssdr: allow_failure: true +docker-gnsssdr-v0.0.10: + image: docker:18.05 + stage: deploy + services: + - docker:dind + script: + - wget https://raw.githubusercontent.com/carlesfernandez/docker-gnsssdr/v0.0.10/Dockerfile + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + - mkdir docker-build + - cd docker-build + - cp ../Dockerfile . + - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . + - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:0.0.10 + - docker push $DOCKER_HUB_USER/$DOCKER_HUB_REPO:0.0.10 + only: + - v0.0.10 + allow_failure: true + + docker-pybombs-gnsssdr: image: docker:latest stage: deploy @@ -429,6 +446,24 @@ docker-access18: - docker push $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 +docker-access18-0.0.10: + image: docker:18.05 + stage: deploy + services: + - docker:dind + script: + - mkdir docker-build + - cd docker-build + - echo -e "FROM phusion/baseimage:0.10.1\nMAINTAINER carles.fernandez@cttc.es\nCMD [\"/sbin/my_init\"]\nWORKDIR /home/src\nRUN apt-get update && apt-get install -y build-essential cmake curl nano libarmadillo-dev libblas-dev libboost-chrono-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev libgflags-dev libgoogle-glog-dev libgtest-dev libgnutls-openssl-dev liblapack-dev liblog4cpp5-dev libmatio-dev git ca-certificates gnuradio-dev python-mako python-six texlive-latex-base texlive-fonts-recommended texlive-font-utils texlive-pictures epstool transfig octave && rm -rf /var/lib/apt/lists/*\nRUN git clone https://gitlab.com/gnss-sdr/gnss-sdr && cd gnss-sdr/build && git checkout v0.0.10 && cmake -DENABLE_PACKAGING=ON -DENABLE_INSTALL_TESTS=ON .. && NPROC=$(grep -c ^processor /proc/cpuinfo) && make -j$(($NPROC+1)) && make install\nRUN /usr/bin/volk_profile -v 8111\nRUN /usr/local/bin/volk_gnsssdr_profile\nRUN apt-get clean && rm -rf /tmp/* /var/tmp/*\nRUN rm -rf /home/src\nWORKDIR /home\nCMD [\"bash\"]" > Dockerfile + - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD" + - docker build -t $DOCKER_HUB_USER/$DOCKER_HUB_REPO . + - docker tag $DOCKER_HUB_USER/$DOCKER_HUB_REPO:latest $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18-0.0.10 + - docker push $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18-0.0.10 + only: + - v0.0.10 + allow_failure: true + + # Stage "experiment" run-access18: image: $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18 @@ -453,7 +488,36 @@ run-access18: - cd .. - mkdir access18 - cp exp-access18/*.pdf access18/ - artifacts: paths: - access18/*.pdf + + +run-access18-0.0.10: + image: $DOCKER_HUB_USER/$DOCKER_HUB_REPO:access18-0.0.10 + stage: experiment + script: + - apt-get update + # Grab the data set + - mkdir -p exp-access18/data + - cd exp-access18/data + - curl https://zenodo.org/record/1184601/files/L2_signal_samples.tar.xz --output L2_signal_samples.tar.xz + - tar xvfJ L2_signal_samples.tar.xz + - echo "3a04c1eeb970776bb77f5e3b7eaff2df L2_signal_samples.tar.xz" > data.md5 + - md5sum -c data.md5 + - cd .. + # Execute the experiment + - cp ../src/utils/reproducibility/ieee-access18/L2-access18.conf . + - cp ../src/utils/reproducibility/ieee-access18/plot_dump.m . + - cp -r ../src/utils/matlab/libs/geoFunctions . + - gnss-sdr --c=L2-access18.conf + - octave --no-gui plot_dump.m + - epspdf Figure2.eps Figure2.pdf + - cd .. + - mkdir access18 + - cp exp-access18/*.pdf access18/ + artifacts: + paths: + - access18/*.pdf + only: + - v0.0.10