From 366f93f175fe2c4729da099fecc12688f840385b Mon Sep 17 00:00:00 2001 From: r9-pena <55148641+r9-pena@users.noreply.github.com> Date: Tue, 22 Jun 2021 16:00:02 -0600 Subject: [PATCH 001/112] Create tutorial-support.yml --- .github/workflows/tutorial-support.yml | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/tutorial-support.yml diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml new file mode 100644 index 0000000000..3d61d128d4 --- /dev/null +++ b/.github/workflows/tutorial-support.yml @@ -0,0 +1,36 @@ +# This is a basic workflow to help you get started with Actions + +name: tutorial-support + +# Controls when the action will run. +on: + # Triggers the workflow on push or pull request events but only for the devel branch + push: + branches: [ master, devel ] + pull_request: + branches: [ master, devel ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + # Build tutorial + - name: tutorial-test + uses: ./.github/actions/ + id: support-test + + # Archive the outputs + - name: 'Archive Logs' + uses: actions/upload-artifact@v2 + with: + name: ci-logs + path: ci-logs.tar.gz + retention-days: 5 From 3ae468279b6e69b22ac48b3775b773359a1da21d Mon Sep 17 00:00:00 2001 From: r9-pena <55148641+r9-pena@users.noreply.github.com> Date: Fri, 25 Jun 2021 11:02:37 -0600 Subject: [PATCH 002/112] Update tutorial-support.yml GpsApp tutorial to be pulled for build test and submodules to be pulled recursively --- .github/workflows/tutorial-support.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 3d61d128d4..23a6b7c669 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -20,11 +20,16 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - name: checkout GpsApp repo + uses: actions/checkout@v2 + with: + repository: r9pena/gps-tutorial + path: gps-tutorial + submodules: recursive # Build tutorial - name: tutorial-test - uses: ./.github/actions/ + uses: ./.github/actions/tutorial/ id: support-test # Archive the outputs From 9a6e941024f32d85b0d132aa9f76734f89ed2ef8 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Mon, 28 Jun 2021 12:57:58 -0600 Subject: [PATCH 003/112] Implementation of tutorial workflow --- .github/actions/tutorial/Dockerfile | 12 ++++++++++++ .github/actions/tutorial/gps-build | 12 ++++++++++++ .github/workflows/tutorial-support.yml | 11 ++++++++--- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 .github/actions/tutorial/Dockerfile create mode 100755 .github/actions/tutorial/gps-build diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile new file mode 100644 index 0000000000..05ea2bc54d --- /dev/null +++ b/.github/actions/tutorial/Dockerfile @@ -0,0 +1,12 @@ +FROM nasafprime/fprime-base + +USER root + +RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ + apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds + +COPY gps-tutorial/gps-tutorial /gps-tutorial + +COPY gps-build /gps-build + +CMD ["./gps-build"] diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build new file mode 100755 index 0000000000..508707dd56 --- /dev/null +++ b/.github/actions/tutorial/gps-build @@ -0,0 +1,12 @@ +#!/bin/bash + +# Exit when any command fails +set -e +set -x + +# git clone --recurse-submodules https://github.com/fprime-community/gps-tutorial.git +cd gps-tutorial/fprime +git fetch +cd ../GpsApp +fprime-util generate +fprime-util build \ No newline at end of file diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 23a6b7c669..36bfca8cd2 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -25,12 +25,17 @@ jobs: with: repository: r9pena/gps-tutorial path: gps-tutorial - submodules: recursive - # Build tutorial + # + - name: checkout latest fprime repo + uses: actions/checkout@v2 + with: + path: gps-tutorial/gps-tutorial + + # Build tutorial test - name: tutorial-test uses: ./.github/actions/tutorial/ - id: support-test + id: gps-build # Archive the outputs - name: 'Archive Logs' From 4078ce35146d2ce6f8976140317d077b5e74f1a7 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Mon, 28 Jun 2021 13:01:35 -0600 Subject: [PATCH 004/112] typo in repo address --- .github/workflows/tutorial-support.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 36bfca8cd2..c460b3f90e 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -23,7 +23,7 @@ jobs: - name: checkout GpsApp repo uses: actions/checkout@v2 with: - repository: r9pena/gps-tutorial + repository: r9-pena/gps-tutorial path: gps-tutorial # From b0b380663ce7c4448cdf49df391b0dd0c5034154 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Mon, 28 Jun 2021 13:14:27 -0600 Subject: [PATCH 005/112] Added missing github action file --- .github/actions/tutorial/github-tutorial-action.yml | 5 +++++ .github/workflows/tutorial-support.yml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .github/actions/tutorial/github-tutorial-action.yml diff --git a/.github/actions/tutorial/github-tutorial-action.yml b/.github/actions/tutorial/github-tutorial-action.yml new file mode 100644 index 0000000000..09eefe1eff --- /dev/null +++ b/.github/actions/tutorial/github-tutorial-action.yml @@ -0,0 +1,5 @@ +name: 'F prime tutorial check' +description: 'Runs community tutorial support on F prime' +runs: + using: 'docker' + image: 'Dockerfile' diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index c460b3f90e..4d41e8e6d3 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -26,7 +26,7 @@ jobs: repository: r9-pena/gps-tutorial path: gps-tutorial - # + # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 with: @@ -35,7 +35,7 @@ jobs: # Build tutorial test - name: tutorial-test uses: ./.github/actions/tutorial/ - id: gps-build + id: github-tutorial-action # Archive the outputs - name: 'Archive Logs' From 45e99a1a0e866b8d5f61700e17877e62dce0b10a Mon Sep 17 00:00:00 2001 From: r9-pena Date: Mon, 28 Jun 2021 13:28:53 -0600 Subject: [PATCH 006/112] Changed workflow path --- .github/workflows/tutorial-support.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 4d41e8e6d3..142168753c 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -34,7 +34,7 @@ jobs: # Build tutorial test - name: tutorial-test - uses: ./.github/actions/tutorial/ + uses: ./gps-tutorial/gps-tutorial/fprime/.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs From bce2af6aaffbef8e4acc13ff8719db24e71dc6e5 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Mon, 28 Jun 2021 13:40:45 -0600 Subject: [PATCH 007/112] Changed dir paths --- .github/workflows/tutorial-support.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 142168753c..e9c9bc843c 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -24,17 +24,16 @@ jobs: uses: actions/checkout@v2 with: repository: r9-pena/gps-tutorial - path: gps-tutorial # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 with: - path: gps-tutorial/gps-tutorial + path: gps-tutorial # Build tutorial test - name: tutorial-test - uses: ./gps-tutorial/gps-tutorial/fprime/.github/actions/tutorial/ + uses: ./gps-tutorial/fprime/.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs From 0811db7d03bb408f11b1f3039c493147fcccfcbb Mon Sep 17 00:00:00 2001 From: r9-pena Date: Mon, 28 Jun 2021 13:49:05 -0600 Subject: [PATCH 008/112] Work around for workflow --- .github/actions/tutorial/gps-build | 2 +- .github/workflows/tutorial-support.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 508707dd56..e8f2a8a18e 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -4,7 +4,7 @@ set -e set -x -# git clone --recurse-submodules https://github.com/fprime-community/gps-tutorial.git +git clone --recurse-submodules https://github.com/fprime-community/gps-tutorial.git cd gps-tutorial/fprime git fetch cd ../GpsApp diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index e9c9bc843c..e5f5edcb0b 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -20,20 +20,20 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - name: checkout GpsApp repo - uses: actions/checkout@v2 - with: - repository: r9-pena/gps-tutorial + #- name: checkout GpsApp repo + # uses: actions/checkout@v2 + # with: + # repository: r9-pena/gps-tutorial # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 - with: - path: gps-tutorial + # with: + # path: gps-tutorial # Build tutorial test - name: tutorial-test - uses: ./gps-tutorial/fprime/.github/actions/tutorial/ + uses: ./.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs From f70bb74e7186712b25fc8c2a5174bd8f61b2f98b Mon Sep 17 00:00:00 2001 From: r9-pena Date: Mon, 28 Jun 2021 13:54:16 -0600 Subject: [PATCH 009/112] work around --- .github/actions/tutorial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index 05ea2bc54d..c1d0647039 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -5,7 +5,7 @@ USER root RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds -COPY gps-tutorial/gps-tutorial /gps-tutorial +#COPY gps-tutorial/gps-tutorial /gps-tutorial COPY gps-build /gps-build From 77836548145eab2b1027f1fc1898b36b0924c75a Mon Sep 17 00:00:00 2001 From: r9-pena Date: Mon, 28 Jun 2021 16:47:59 -0600 Subject: [PATCH 010/112] troubleshooting --- .github/actions/tutorial/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index c1d0647039..bf450db0cb 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -9,4 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ COPY gps-build /gps-build -CMD ["./gps-build"] +CMD ["ls -la"] + +#CMD ["./gps-build"] From 2b47ec730556b14fc4c5985c9474f654b761b026 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Mon, 28 Jun 2021 16:52:42 -0600 Subject: [PATCH 011/112] troubleshoot --- .github/actions/tutorial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index bf450db0cb..777b73774a 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -9,6 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ COPY gps-build /gps-build -CMD ["ls -la"] +RUN ls -la #CMD ["./gps-build"] From e80529ce7a47ea30bf6a5e09a5fc4af6bb211126 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Mon, 28 Jun 2021 16:58:25 -0600 Subject: [PATCH 012/112] troubleshoot --- .github/actions/tutorial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index 777b73774a..f4ac1110d7 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -11,4 +11,4 @@ COPY gps-build /gps-build RUN ls -la -#CMD ["./gps-build"] +ENTRYPOINT ["/gps-build"] From 0a3d2e6de6cfd471874fab4d5b46b3e421d834b4 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Tue, 29 Jun 2021 17:43:21 -0600 Subject: [PATCH 013/112] Performance update --- .github/actions/tutorial/Dockerfile | 4 +++- .github/actions/tutorial/gps-build | 8 ++++---- .github/workflows/tutorial-support.yml | 14 ++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index f4ac1110d7..18da06da69 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -5,7 +5,9 @@ USER root RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds -#COPY gps-tutorial/gps-tutorial /gps-tutorial +COPY gps-tutorial/GpsApp / + +COPY fprime / COPY gps-build /gps-build diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index e8f2a8a18e..bee88ceb5a 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -4,9 +4,9 @@ set -e set -x -git clone --recurse-submodules https://github.com/fprime-community/gps-tutorial.git -cd gps-tutorial/fprime -git fetch -cd ../GpsApp +#git clone --recurse-submodules https://github.com/fprime-community/gps-tutorial.git +#cd gps-tutorial/fprime +#git fetch +cd GpsApp fprime-util generate fprime-util build \ No newline at end of file diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index e5f5edcb0b..65cacaa417 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -19,17 +19,15 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - #- name: checkout GpsApp repo - # uses: actions/checkout@v2 - # with: - # repository: r9-pena/gps-tutorial - # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 - # with: - # path: gps-tutorial + + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - name: checkout GpsApp repo + uses: actions/checkout@v2 + with: + repository: r9-pena/gps-tutorial # Build tutorial test - name: tutorial-test From 21036045c7c0ba6006c575116766b08cf4bba70d Mon Sep 17 00:00:00 2001 From: r9-pena Date: Tue, 29 Jun 2021 17:46:19 -0600 Subject: [PATCH 014/112] Path correction --- .github/workflows/tutorial-support.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 65cacaa417..906c0b16e6 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -31,7 +31,7 @@ jobs: # Build tutorial test - name: tutorial-test - uses: ./.github/actions/tutorial/ + uses: ./fprime/.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs From e03fd06c588c7298380b3ac8d49d73f66044609e Mon Sep 17 00:00:00 2001 From: r9-pena Date: Tue, 29 Jun 2021 17:49:22 -0600 Subject: [PATCH 015/112] troubleshoot --- .github/workflows/tutorial-support.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 906c0b16e6..dd3b984624 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -19,19 +19,19 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out latest version of the fprime repo - - name: checkout latest fprime repo - uses: actions/checkout@v2 - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: checkout GpsApp repo uses: actions/checkout@v2 with: repository: r9-pena/gps-tutorial + # Checks-out latest version of the fprime repo + - name: checkout latest fprime repo + uses: actions/checkout@v2 + # Build tutorial test - name: tutorial-test - uses: ./fprime/.github/actions/tutorial/ + uses: ./.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs From 15374d07c641c9d617107b28000e8f9dfe596210 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Tue, 29 Jun 2021 17:52:38 -0600 Subject: [PATCH 016/112] Dockerfile correction --- .github/actions/tutorial/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index 18da06da69..d23b3ed53f 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -5,9 +5,9 @@ USER root RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds -COPY gps-tutorial/GpsApp / +COPY /gps-tutorial/GpsApp / -COPY fprime / +COPY /fprime / COPY gps-build /gps-build From 6ce47d2fed67187d06a67cb02131ad91efc89346 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 10:26:23 -0600 Subject: [PATCH 017/112] path change --- .github/actions/tutorial/Dockerfile | 4 ++-- .github/workflows/tutorial-support.yml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index d23b3ed53f..ffcadb0a30 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -5,9 +5,9 @@ USER root RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds -COPY /gps-tutorial/GpsApp / +COPY ./gps/gps-tutorial/GpsApp / -COPY /fprime / +COPY /fprime-repo / COPY gps-build /gps-build diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index dd3b984624..da6d72c2e8 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -24,10 +24,13 @@ jobs: uses: actions/checkout@v2 with: repository: r9-pena/gps-tutorial + path: ./gps # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 + with: + path: ./fprime-repo # Build tutorial test - name: tutorial-test From 4c2c09f0d0f781c955f2d807ba3c0b326cf7c95b Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 10:28:15 -0600 Subject: [PATCH 018/112] path change --- .github/actions/tutorial/Dockerfile | 2 +- .github/workflows/tutorial-support.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index ffcadb0a30..59e515a45b 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ COPY ./gps/gps-tutorial/GpsApp / -COPY /fprime-repo / +COPY /fprime / COPY gps-build /gps-build diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index da6d72c2e8..7262bdafcc 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -30,7 +30,7 @@ jobs: - name: checkout latest fprime repo uses: actions/checkout@v2 with: - path: ./fprime-repo + path: ./fprime # Build tutorial test - name: tutorial-test From 91f3ab3d67b9fbbc85c0d805f3e9c347eeaa6f3f Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 10:30:00 -0600 Subject: [PATCH 019/112] path fix --- .github/workflows/tutorial-support.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 7262bdafcc..0624af95d1 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -34,7 +34,7 @@ jobs: # Build tutorial test - name: tutorial-test - uses: ./.github/actions/tutorial/ + uses: ./fprime/.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs From 61191bfe102d3f77216832dc068794f94ca0d470 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 10:35:20 -0600 Subject: [PATCH 020/112] path fix --- .github/actions/tutorial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index 59e515a45b..295df5a3bf 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -5,7 +5,7 @@ USER root RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds -COPY ./gps/gps-tutorial/GpsApp / +COPY /gps/gps-tutorial/GpsApp / COPY /fprime / From c819a78131a2d7c006be960d1a70d7ea63e1cd28 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 10:41:15 -0600 Subject: [PATCH 021/112] path fix --- .github/actions/tutorial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index 295df5a3bf..0b13c90c4b 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -5,7 +5,7 @@ USER root RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds -COPY /gps/gps-tutorial/GpsApp / +COPY ../../../../gps/gps-tutorial/GpsApp / COPY /fprime / From 1096697ec4c98c65fee4268e629509357812a1a1 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 10:53:20 -0600 Subject: [PATCH 022/112] path fix --- .github/actions/tutorial/Dockerfile | 10 +++++----- .github/workflows/tutorial-support.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index 0b13c90c4b..69186a8c24 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -2,15 +2,15 @@ FROM nasafprime/fprime-base USER root -RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ - apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds +#RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ +# apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds -COPY ../../../../gps/gps-tutorial/GpsApp / +COPY gps/fprime / -COPY /fprime / +COPY gps/gps-tutorial/GpsApp / COPY gps-build /gps-build RUN ls -la -ENTRYPOINT ["/gps-build"] +#ENTRYPOINT ["/gps-build"] diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 0624af95d1..92a0bdcad5 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -30,11 +30,11 @@ jobs: - name: checkout latest fprime repo uses: actions/checkout@v2 with: - path: ./fprime + path: ./gps # Build tutorial test - name: tutorial-test - uses: ./fprime/.github/actions/tutorial/ + uses: ./gps/fprime/.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs From 202100b2113ed5553a597a524ea6969c823c2089 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 10:56:00 -0600 Subject: [PATCH 023/112] paht fix --- .github/workflows/tutorial-support.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 92a0bdcad5..b1c3541df2 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -24,13 +24,13 @@ jobs: uses: actions/checkout@v2 with: repository: r9-pena/gps-tutorial - path: ./gps + path: ./gps/gps-tutorial # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 with: - path: ./gps + path: ./gps/fprime # Build tutorial test - name: tutorial-test From a22de723d5902d117cff787e1fa41c7150b41814 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 11:11:31 -0600 Subject: [PATCH 024/112] Revert to changes --- .github/actions/tutorial/Dockerfile | 4 ++-- .github/workflows/tutorial-support.yml | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index 69186a8c24..56fb575275 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -5,9 +5,9 @@ USER root #RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ # apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds -COPY gps/fprime / +#COPY gps/fprime / -COPY gps/gps-tutorial/GpsApp / +#COPY gps/gps-tutorial/GpsApp / COPY gps-build /gps-build diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index b1c3541df2..c7c5b44f58 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -20,21 +20,19 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - name: checkout GpsApp repo - uses: actions/checkout@v2 - with: - repository: r9-pena/gps-tutorial - path: ./gps/gps-tutorial + #- name: checkout GpsApp repo + # uses: actions/checkout@v2 + # with: + # repository: r9-pena/gps-tutorial + # path: ./gps/gps-tutorial # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 - with: - path: ./gps/fprime # Build tutorial test - name: tutorial-test - uses: ./gps/fprime/.github/actions/tutorial/ + uses: ./.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs From d6b1a7de362ce9f7983feaf2ca364c23b239bb4a Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 11:20:17 -0600 Subject: [PATCH 025/112] Completed workflow for tutorial support --- .github/actions/tutorial/Dockerfile | 12 +++--------- .github/actions/tutorial/gps-build | 11 ++++++++--- .github/workflows/tutorial-support.yml | 7 ------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index 56fb575275..45cf434e9c 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -2,15 +2,9 @@ FROM nasafprime/fprime-base USER root -#RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ -# apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds - -#COPY gps/fprime / - -#COPY gps/gps-tutorial/GpsApp / +RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ + apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds COPY gps-build /gps-build -RUN ls -la - -#ENTRYPOINT ["/gps-build"] +ENTRYPOINT ["/gps-build"] diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index bee88ceb5a..cfa5795d02 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -4,9 +4,14 @@ set -e set -x -#git clone --recurse-submodules https://github.com/fprime-community/gps-tutorial.git -#cd gps-tutorial/fprime -#git fetch +# Clone community repo for GpsApp +git clone --recurse-submodules https://github.com/fprime-community/gps-tutorial.git + +# Update fprime directory w/ latest release +cd gps-tutorial/fprime +git fetch + +# Build GpsApp cd GpsApp fprime-util generate fprime-util build \ No newline at end of file diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index c7c5b44f58..e27aacc61d 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -19,13 +19,6 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - #- name: checkout GpsApp repo - # uses: actions/checkout@v2 - # with: - # repository: r9-pena/gps-tutorial - # path: ./gps/gps-tutorial - # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 From e54d12d19ff7e4c629a7ca49057199e3c9e36c52 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 11:28:37 -0600 Subject: [PATCH 026/112] troubleshoot --- .github/actions/tutorial/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index 45cf434e9c..c61f041f9d 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -7,4 +7,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ COPY gps-build /gps-build -ENTRYPOINT ["/gps-build"] +RUN ls -la + +ENTRYPOINT ["/gps-build"] \ No newline at end of file From 9c9540655e98150c64b0aae0c5c6a8d549355f27 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 11:33:33 -0600 Subject: [PATCH 027/112] Build path error --- .github/actions/tutorial/Dockerfile | 2 -- .github/actions/tutorial/gps-build | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index c61f041f9d..8cf2739a1e 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -7,6 +7,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ COPY gps-build /gps-build -RUN ls -la - ENTRYPOINT ["/gps-build"] \ No newline at end of file diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index cfa5795d02..1f884e2d01 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -12,6 +12,6 @@ cd gps-tutorial/fprime git fetch # Build GpsApp -cd GpsApp +cd ../GpsApp fprime-util generate fprime-util build \ No newline at end of file From a8b0f27f45f535dbfd217fa602c083e7ad1c305a Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 12:49:30 -0600 Subject: [PATCH 028/112] Optimization of workflow --- .github/actions/tutorial/gps-build | 15 +++++++++------ .github/workflows/tutorial-support.yml | 10 +++++++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 1f884e2d01..7ae0021147 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -5,13 +5,16 @@ set -e set -x # Clone community repo for GpsApp -git clone --recurse-submodules https://github.com/fprime-community/gps-tutorial.git +#git clone --recurse-submodules https://github.com/fprime-community/gps-tutorial.git +cd "$GITHUB_WORKSPACE" # Update fprime directory w/ latest release -cd gps-tutorial/fprime -git fetch +#cd gps-tutorial/fprime +#git fetch + +ls -la # Build GpsApp -cd ../GpsApp -fprime-util generate -fprime-util build \ No newline at end of file +#cd gps/GpsApp +#fprime-util generate +#fprime-util build \ No newline at end of file diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index e27aacc61d..dc71d4f8a6 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -19,18 +19,26 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + - name: checkout latest GpsApp repo + uses: actions/checkout@v2 + with: + path: gps + # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 + with: + path: gps/gps-tutorial/ # Build tutorial test - name: tutorial-test - uses: ./.github/actions/tutorial/ + uses: ./fprime/.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs - name: 'Archive Logs' uses: actions/upload-artifact@v2 + if: always() with: name: ci-logs path: ci-logs.tar.gz From 91e4a84ecea21bf9d3e13c99c4070b96d1f61e1c Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 12:51:10 -0600 Subject: [PATCH 029/112] Path fix --- .github/actions/tutorial/Dockerfile | 4 ++-- .github/workflows/tutorial-support.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index 8cf2739a1e..c26f37f865 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -2,8 +2,8 @@ FROM nasafprime/fprime-base USER root -RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ - apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds +#RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ +# apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds COPY gps-build /gps-build diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index dc71d4f8a6..ff57884f6b 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -32,7 +32,7 @@ jobs: # Build tutorial test - name: tutorial-test - uses: ./fprime/.github/actions/tutorial/ + uses: ./gps/gps-tutorial/fprime/.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs From 83eb47212f9bccdfed3e8b1d1cbcb5144059ceda Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 12:56:04 -0600 Subject: [PATCH 030/112] Path fix --- .github/workflows/tutorial-support.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index ff57884f6b..e658af2415 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -22,13 +22,13 @@ jobs: - name: checkout latest GpsApp repo uses: actions/checkout@v2 with: - path: gps + path: ./gps # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 with: - path: gps/gps-tutorial/ + path: ./gps/gps-tutorial/ # Build tutorial test - name: tutorial-test From 8b261b46c40b7c781cc9d88e6ac862c9662bf3bb Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 13:06:02 -0600 Subject: [PATCH 031/112] Path fix #1 --- .github/workflows/tutorial-support.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index e658af2415..41160d118e 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -28,11 +28,11 @@ jobs: - name: checkout latest fprime repo uses: actions/checkout@v2 with: - path: ./gps/gps-tutorial/ + path: ./gps-tutorial # Build tutorial test - name: tutorial-test - uses: ./gps/gps-tutorial/fprime/.github/actions/tutorial/ + uses: ./gps-tutorial/fprime/.github/actions/tutorial/ id: github-tutorial-action # Archive the outputs From 09f7fad84d7ed4eefc55c63a54fb5ae7ce0fcadc Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 13:10:45 -0600 Subject: [PATCH 032/112] path fix #2 --- .github/workflows/tutorial-support.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index 41160d118e..cba75c3e9f 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -22,13 +22,14 @@ jobs: - name: checkout latest GpsApp repo uses: actions/checkout@v2 with: - path: ./gps + repository: r9-pena/gps-tutorial + path: ./gps-tutorial # Checks-out latest version of the fprime repo - name: checkout latest fprime repo uses: actions/checkout@v2 with: - path: ./gps-tutorial + path: ./gps-tutorial/fprime # Build tutorial test - name: tutorial-test From aae982f1e783352cb7035c6ac0b60cf2c9d44f19 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 13:15:45 -0600 Subject: [PATCH 033/112] path check --- .github/actions/tutorial/gps-build | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 7ae0021147..e8187452ab 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -12,6 +12,7 @@ cd "$GITHUB_WORKSPACE" #cd gps-tutorial/fprime #git fetch +cd gps-tutorial/fprime ls -la # Build GpsApp From e09f537c6db164d596a28b2e6a4c9fd0e91f818f Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 13:21:28 -0600 Subject: [PATCH 034/112] Workflow test --- .github/actions/tutorial/gps-build | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index e8187452ab..d59101421b 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -4,18 +4,12 @@ set -e set -x -# Clone community repo for GpsApp -#git clone --recurse-submodules https://github.com/fprime-community/gps-tutorial.git +# Change to GitHub workspace cd "$GITHUB_WORKSPACE" -# Update fprime directory w/ latest release -#cd gps-tutorial/fprime -#git fetch - -cd gps-tutorial/fprime -ls -la +# Move to GpsApp directory +cd gps-tutorial/GpsApp # Build GpsApp -#cd gps/GpsApp -#fprime-util generate -#fprime-util build \ No newline at end of file +fprime-util generate +fprime-util build \ No newline at end of file From 051604e376680690a8e04a31ac9cc461c788af10 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 30 Jun 2021 13:23:41 -0600 Subject: [PATCH 035/112] Workflow test #2 --- .github/actions/tutorial/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/tutorial/Dockerfile b/.github/actions/tutorial/Dockerfile index c26f37f865..8cf2739a1e 100644 --- a/.github/actions/tutorial/Dockerfile +++ b/.github/actions/tutorial/Dockerfile @@ -2,8 +2,8 @@ FROM nasafprime/fprime-base USER root -#RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ -# apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds +RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ + apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds COPY gps-build /gps-build From d0ad5f12e3245e81b6938c0e083f70aafdb9700d Mon Sep 17 00:00:00 2001 From: r9-pena Date: Thu, 1 Jul 2021 16:01:40 -0600 Subject: [PATCH 036/112] Added logging feature --- .github/actions/tutorial/gps-build | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index d59101421b..dc21980d6d 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -7,9 +7,20 @@ set -x # Change to GitHub workspace cd "$GITHUB_WORKSPACE" +export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutotial/fprime/..; pwd)" + +export SCRIPT_DIR="${FPRIME_DIR}/ci" +. "${SCRIPT_DIR}/helpers.bash" + +export LOG_DIR="${FPRIME_DIR}/.github/actions/tutorial/ci-logs-$(date +"%Y-%m-%dT%H%M%S")" +mkdir -p "${LOG_DIR}" + # Move to GpsApp directory cd gps-tutorial/GpsApp # Build GpsApp fprime-util generate -fprime-util build \ No newline at end of file +fprime-util build + +# Log +archive_logs \ No newline at end of file From 0e0be62e217fd64210ccb6c30871c19a9670d8cf Mon Sep 17 00:00:00 2001 From: r9-pena Date: Thu, 1 Jul 2021 16:06:46 -0600 Subject: [PATCH 037/112] Logs Troubleshoot --- .github/actions/tutorial/gps-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index dc21980d6d..2f02a1eabf 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -7,7 +7,7 @@ set -x # Change to GitHub workspace cd "$GITHUB_WORKSPACE" -export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutotial/fprime/..; pwd)" +export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutotial/fprime)" export SCRIPT_DIR="${FPRIME_DIR}/ci" . "${SCRIPT_DIR}/helpers.bash" From cb7bfca856ec1aea4e532686143ba6968ffd0ec6 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Thu, 1 Jul 2021 16:09:54 -0600 Subject: [PATCH 038/112] Typo fix --- .github/actions/tutorial/gps-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 2f02a1eabf..9df99d6f7d 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -7,7 +7,7 @@ set -x # Change to GitHub workspace cd "$GITHUB_WORKSPACE" -export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutotial/fprime)" +export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutotial/fprime" export SCRIPT_DIR="${FPRIME_DIR}/ci" . "${SCRIPT_DIR}/helpers.bash" From 68cc7201f7e8d1378a6466ffcd5679febf27350a Mon Sep 17 00:00:00 2001 From: r9-pena Date: Thu, 1 Jul 2021 16:19:14 -0600 Subject: [PATCH 039/112] Troubleshoot #1 --- .github/actions/tutorial/gps-build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 9df99d6f7d..2dddd4a672 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -7,9 +7,13 @@ set -x # Change to GitHub workspace cd "$GITHUB_WORKSPACE" +gps-tutorial/fprime/ci/helpers.bash + export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutotial/fprime" export SCRIPT_DIR="${FPRIME_DIR}/ci" +${SCRIPT_DIR} ls -la + . "${SCRIPT_DIR}/helpers.bash" export LOG_DIR="${FPRIME_DIR}/.github/actions/tutorial/ci-logs-$(date +"%Y-%m-%dT%H%M%S")" From b5754377d2488a8be250c0bc423a94de8c98d82d Mon Sep 17 00:00:00 2001 From: r9-pena Date: Thu, 1 Jul 2021 16:26:00 -0600 Subject: [PATCH 040/112] Troubleshoot #2 --- .github/actions/tutorial/gps-build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 2dddd4a672..0db31cd79c 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -7,10 +7,12 @@ set -x # Change to GitHub workspace cd "$GITHUB_WORKSPACE" -gps-tutorial/fprime/ci/helpers.bash +ls -la export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutotial/fprime" +${FPRIME_DIR} ls -la + export SCRIPT_DIR="${FPRIME_DIR}/ci" ${SCRIPT_DIR} ls -la From 62102b8f7f53e92d780face7e9e7ed1e7babab85 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Thu, 1 Jul 2021 16:30:48 -0600 Subject: [PATCH 041/112] Corrected typo on path --- .github/actions/tutorial/gps-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 0db31cd79c..2efc2d26f5 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -9,7 +9,7 @@ cd "$GITHUB_WORKSPACE" ls -la -export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutotial/fprime" +export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutorial/fprime" ${FPRIME_DIR} ls -la From ee6e8f2e4bea086cc5b39b0271d1c44702f88f5c Mon Sep 17 00:00:00 2001 From: r9-pena Date: Thu, 1 Jul 2021 16:33:36 -0600 Subject: [PATCH 042/112] Troubleshoot #3 --- .github/actions/tutorial/gps-build | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 2efc2d26f5..1b4e7b8974 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -7,14 +7,9 @@ set -x # Change to GitHub workspace cd "$GITHUB_WORKSPACE" -ls -la - export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutorial/fprime" -${FPRIME_DIR} ls -la - export SCRIPT_DIR="${FPRIME_DIR}/ci" -${SCRIPT_DIR} ls -la . "${SCRIPT_DIR}/helpers.bash" From 3ccff2c85c4fbb0a373342e7b66e4a58a63b70d8 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Thu, 1 Jul 2021 16:47:39 -0600 Subject: [PATCH 043/112] Troubleshoot #4 --- .github/actions/tutorial/gps-build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 1b4e7b8974..918f422fa7 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -14,14 +14,17 @@ export SCRIPT_DIR="${FPRIME_DIR}/ci" . "${SCRIPT_DIR}/helpers.bash" export LOG_DIR="${FPRIME_DIR}/.github/actions/tutorial/ci-logs-$(date +"%Y-%m-%dT%H%M%S")" +cd ${LOG_DIR} +ls -l mkdir -p "${LOG_DIR}" +ls -l # Move to GpsApp directory -cd gps-tutorial/GpsApp +#cd gps-tutorial/GpsApp # Build GpsApp -fprime-util generate -fprime-util build +#fprime-util generate +#fprime-util build # Log archive_logs \ No newline at end of file From 9000af62d1e0bb2eb72c21482a29c9e49bb23f28 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Thu, 1 Jul 2021 16:51:55 -0600 Subject: [PATCH 044/112] Troubleshoot #5 --- .github/actions/tutorial/gps-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 918f422fa7..35dc70ebd5 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -14,7 +14,7 @@ export SCRIPT_DIR="${FPRIME_DIR}/ci" . "${SCRIPT_DIR}/helpers.bash" export LOG_DIR="${FPRIME_DIR}/.github/actions/tutorial/ci-logs-$(date +"%Y-%m-%dT%H%M%S")" -cd ${LOG_DIR} +cd ${FPRIME_DIR}/.github/actions/tutorial ls -l mkdir -p "${LOG_DIR}" ls -l From f75fafcb9f4dc5bc5c4b3158b8735ed3d418740e Mon Sep 17 00:00:00 2001 From: r9-pena Date: Thu, 1 Jul 2021 17:17:28 -0600 Subject: [PATCH 045/112] Removed log archive feature --- .github/actions/tutorial/gps-build | 21 +++------------------ .github/workflows/tutorial-support.yml | 9 --------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/.github/actions/tutorial/gps-build b/.github/actions/tutorial/gps-build index 35dc70ebd5..d59101421b 100755 --- a/.github/actions/tutorial/gps-build +++ b/.github/actions/tutorial/gps-build @@ -7,24 +7,9 @@ set -x # Change to GitHub workspace cd "$GITHUB_WORKSPACE" -export FPRIME_DIR="$GITHUB_WORKSPACE/gps-tutorial/fprime" - -export SCRIPT_DIR="${FPRIME_DIR}/ci" - -. "${SCRIPT_DIR}/helpers.bash" - -export LOG_DIR="${FPRIME_DIR}/.github/actions/tutorial/ci-logs-$(date +"%Y-%m-%dT%H%M%S")" -cd ${FPRIME_DIR}/.github/actions/tutorial -ls -l -mkdir -p "${LOG_DIR}" -ls -l - # Move to GpsApp directory -#cd gps-tutorial/GpsApp +cd gps-tutorial/GpsApp # Build GpsApp -#fprime-util generate -#fprime-util build - -# Log -archive_logs \ No newline at end of file +fprime-util generate +fprime-util build \ No newline at end of file diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index cba75c3e9f..bcdd06750d 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -35,12 +35,3 @@ jobs: - name: tutorial-test uses: ./gps-tutorial/fprime/.github/actions/tutorial/ id: github-tutorial-action - - # Archive the outputs - - name: 'Archive Logs' - uses: actions/upload-artifact@v2 - if: always() - with: - name: ci-logs - path: ci-logs.tar.gz - retention-days: 5 From 0aa43bd631831037fd65983f11e60a9144244c6f Mon Sep 17 00:00:00 2001 From: r9-pena Date: Tue, 6 Jul 2021 10:02:34 -0600 Subject: [PATCH 046/112] Changed repo path to conform pull request merge --- .github/workflows/tutorial-support.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tutorial-support.yml b/.github/workflows/tutorial-support.yml index bcdd06750d..16ba8ba9c7 100644 --- a/.github/workflows/tutorial-support.yml +++ b/.github/workflows/tutorial-support.yml @@ -22,7 +22,7 @@ jobs: - name: checkout latest GpsApp repo uses: actions/checkout@v2 with: - repository: r9-pena/gps-tutorial + repository: fprime-community/gps-tutorial path: ./gps-tutorial # Checks-out latest version of the fprime repo From 6e5cc22c73d1dad7467eb1f52fcee8e742c7fa34 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 10:00:16 -0600 Subject: [PATCH 047/112] Test run #1 --- .github/actions/Dockerfile | 3 ++- .github/actions/entrypoint.sh | 7 ++++--- .github/actions/github-ci-action.yml | 7 +++++++ .github/workflows/build-test.yml | 2 ++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile index 45ade8aad7..44252ffc59 100644 --- a/.github/actions/Dockerfile +++ b/.github/actions/Dockerfile @@ -9,5 +9,6 @@ COPY autodoc.bash /autodoc.bash USER fprime # Code file to execute when the docker container starts up (`entrypoint.sh`) -ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["/entrypoint.sh", $1] + diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh index 24f5c668e1..30264ed0fa 100755 --- a/.github/actions/entrypoint.sh +++ b/.github/actions/entrypoint.sh @@ -4,9 +4,10 @@ set -e set -x cd "$GITHUB_WORKSPACE" -if [ "$GITHUB_WORKFLOW" != "Autodocs" ] +if [ "$GITHUB_WORKFLOW" == "Autodocs" ] then - "$GITHUB_WORKSPACE/ci/master.bash" QUICK -else /autodoc.bash +else + echo $1 + #"$GITHUB_WORKSPACE/ci/master.bash" $1 fi diff --git a/.github/actions/github-ci-action.yml b/.github/actions/github-ci-action.yml index 058775f1b3..4797cb9d5f 100644 --- a/.github/actions/github-ci-action.yml +++ b/.github/actions/github-ci-action.yml @@ -1,5 +1,12 @@ name: 'F prime CI' description: 'Runs continuous integration testing on F prime' +inputs: + test_type: + description: Test number to run + required: true + default: 1 runs: using: 'docker' image: 'Dockerfile' + args: + - ${{ inputs.test_type }} diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ec37f10463..9a0ac51bb5 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -25,6 +25,8 @@ jobs: - name: F prime CI step uses: ./.github/actions/ id: github-ci-action + with: + test_type: "QUICK" # Archive the outputs - name: 'Archive Logs' uses: actions/upload-artifact@v2 From 1b1dab2d9a5b54f0774894f179de3b44ccb309b6 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 10:07:30 -0600 Subject: [PATCH 048/112] test #2 --- .github/actions/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile index 44252ffc59..27edef7ac3 100644 --- a/.github/actions/Dockerfile +++ b/.github/actions/Dockerfile @@ -9,6 +9,6 @@ COPY autodoc.bash /autodoc.bash USER fprime # Code file to execute when the docker container starts up (`entrypoint.sh`) -ENTRYPOINT ["/entrypoint.sh", $1] +ENTRYPOINT ["/entrypoint.sh", "$1"] From 0c412ed7fb8249aa376936e480054cccd1920a10 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 11:06:24 -0600 Subject: [PATCH 049/112] test #3 --- .github/actions/Dockerfile | 6 +++--- .github/actions/entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile index 27edef7ac3..4208a81ae1 100644 --- a/.github/actions/Dockerfile +++ b/.github/actions/Dockerfile @@ -2,13 +2,13 @@ FROM nasafprime/fprime-base:latest # Copies your code file from your action repository to the filesystem path `/` of the container USER root -RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ - apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds +#RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ +# apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds COPY entrypoint.sh /entrypoint.sh COPY autodoc.bash /autodoc.bash USER fprime # Code file to execute when the docker container starts up (`entrypoint.sh`) -ENTRYPOINT ["/entrypoint.sh", "$1"] +ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh index 30264ed0fa..9ca229961f 100755 --- a/.github/actions/entrypoint.sh +++ b/.github/actions/entrypoint.sh @@ -8,6 +8,6 @@ if [ "$GITHUB_WORKFLOW" == "Autodocs" ] then /autodoc.bash else - echo $1 + echo $* #"$GITHUB_WORKSPACE/ci/master.bash" $1 fi From 21fa03179515980a582a0138c0f6bae15a3204bb Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 11:07:28 -0600 Subject: [PATCH 050/112] added branch for workflow test --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 9a0ac51bb5..a0732e8413 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -6,7 +6,7 @@ name: CI # events but only for the master branch on: push: - branches: [ master, devel ] + branches: [ master, devel, CI-test ] pull_request: branches: [ master, devel, release/v3.0.0 ] From b6f824762dc4e07c65edf7b53b4652d815a00722 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 11:11:04 -0600 Subject: [PATCH 051/112] test #4 --- .github/actions/Dockerfile | 2 +- .github/actions/entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile index 4208a81ae1..eb7d2194f3 100644 --- a/.github/actions/Dockerfile +++ b/.github/actions/Dockerfile @@ -9,6 +9,6 @@ COPY autodoc.bash /autodoc.bash USER fprime # Code file to execute when the docker container starts up (`entrypoint.sh`) -ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["/entrypoint.sh", "hello World"] diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh index 9ca229961f..bcd6a0b2aa 100755 --- a/.github/actions/entrypoint.sh +++ b/.github/actions/entrypoint.sh @@ -4,7 +4,7 @@ set -e set -x cd "$GITHUB_WORKSPACE" -if [ "$GITHUB_WORKFLOW" == "Autodocs" ] +if "$GITHUB_WORKFLOW" == "Autodocs" then /autodoc.bash else From e28745298b80141ea79b817094dea3eff86a70c2 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 12:03:26 -0600 Subject: [PATCH 052/112] test #4 --- .github/actions/Dockerfile | 2 +- .github/actions/entrypoint.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile index eb7d2194f3..4208a81ae1 100644 --- a/.github/actions/Dockerfile +++ b/.github/actions/Dockerfile @@ -9,6 +9,6 @@ COPY autodoc.bash /autodoc.bash USER fprime # Code file to execute when the docker container starts up (`entrypoint.sh`) -ENTRYPOINT ["/entrypoint.sh", "hello World"] +ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh index bcd6a0b2aa..2ae9316c8b 100755 --- a/.github/actions/entrypoint.sh +++ b/.github/actions/entrypoint.sh @@ -8,6 +8,6 @@ if "$GITHUB_WORKFLOW" == "Autodocs" then /autodoc.bash else - echo $* - #"$GITHUB_WORKSPACE/ci/master.bash" $1 + #echo $* + "$GITHUB_WORKSPACE/ci/master.bash" $1 fi From 458e1f95bd1466a3f89f3ef49fa32d12195ab625 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 12:09:48 -0600 Subject: [PATCH 053/112] test #5 --- .github/actions/entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh index 2ae9316c8b..bcd6a0b2aa 100755 --- a/.github/actions/entrypoint.sh +++ b/.github/actions/entrypoint.sh @@ -8,6 +8,6 @@ if "$GITHUB_WORKFLOW" == "Autodocs" then /autodoc.bash else - #echo $* - "$GITHUB_WORKSPACE/ci/master.bash" $1 + echo $* + #"$GITHUB_WORKSPACE/ci/master.bash" $1 fi From 793bb9b4b145e4bcc83cc9a1b5fd8b09b1f80bf7 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 12:25:31 -0600 Subject: [PATCH 054/112] test #6 --- .github/actions/Dockerfile | 2 +- .github/actions/entrypoint.sh | 2 +- .github/actions/github-ci-action.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile index 4208a81ae1..b084f983c7 100644 --- a/.github/actions/Dockerfile +++ b/.github/actions/Dockerfile @@ -9,6 +9,6 @@ COPY autodoc.bash /autodoc.bash USER fprime # Code file to execute when the docker container starts up (`entrypoint.sh`) -ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["/entrypoint.sh", $INPUT_TEST1] diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh index bcd6a0b2aa..61c077ce33 100755 --- a/.github/actions/entrypoint.sh +++ b/.github/actions/entrypoint.sh @@ -9,5 +9,5 @@ then /autodoc.bash else echo $* - #"$GITHUB_WORKSPACE/ci/master.bash" $1 + #"$GITHUB_WORKSPACE/ci/master.bash" $* fi diff --git a/.github/actions/github-ci-action.yml b/.github/actions/github-ci-action.yml index 4797cb9d5f..cb435a28f9 100644 --- a/.github/actions/github-ci-action.yml +++ b/.github/actions/github-ci-action.yml @@ -1,10 +1,10 @@ name: 'F prime CI' description: 'Runs continuous integration testing on F prime' inputs: - test_type: + test1: description: Test number to run required: true - default: 1 + default: '1' runs: using: 'docker' image: 'Dockerfile' From aca3f787c77289af9c1c736dd6ba94d27bdc6276 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 12:28:25 -0600 Subject: [PATCH 055/112] Test #7 --- .github/actions/Dockerfile | 2 +- .github/actions/entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile index b084f983c7..4208a81ae1 100644 --- a/.github/actions/Dockerfile +++ b/.github/actions/Dockerfile @@ -9,6 +9,6 @@ COPY autodoc.bash /autodoc.bash USER fprime # Code file to execute when the docker container starts up (`entrypoint.sh`) -ENTRYPOINT ["/entrypoint.sh", $INPUT_TEST1] +ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh index 61c077ce33..e015dc84f4 100755 --- a/.github/actions/entrypoint.sh +++ b/.github/actions/entrypoint.sh @@ -8,6 +8,6 @@ if "$GITHUB_WORKFLOW" == "Autodocs" then /autodoc.bash else - echo $* + echo "$INPUT_TEST1" #"$GITHUB_WORKSPACE/ci/master.bash" $* fi From b38764eb3a26124d341ee6964aaee1a7a2707462 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 12:33:13 -0600 Subject: [PATCH 056/112] test #8 --- .github/actions/github-ci-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/github-ci-action.yml b/.github/actions/github-ci-action.yml index cb435a28f9..c599cd01bc 100644 --- a/.github/actions/github-ci-action.yml +++ b/.github/actions/github-ci-action.yml @@ -9,4 +9,4 @@ runs: using: 'docker' image: 'Dockerfile' args: - - ${{ inputs.test_type }} + - ${{ inputs.test1 }} From 6dcdb5deaf42c570ca7a410757098c37be66e599 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 12:42:11 -0600 Subject: [PATCH 057/112] test #8 --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index a0732e8413..27874cb6d8 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: uses: ./.github/actions/ id: github-ci-action with: - test_type: "QUICK" + test1: 'QUICK' # Archive the outputs - name: 'Archive Logs' uses: actions/upload-artifact@v2 From b31b67ac1a1b659601efc190f750db83ff72d600 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Wed, 14 Jul 2021 13:12:18 -0600 Subject: [PATCH 058/112] Test #9 --- .github/actions/entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh index e015dc84f4..c91e217cb3 100755 --- a/.github/actions/entrypoint.sh +++ b/.github/actions/entrypoint.sh @@ -8,6 +8,6 @@ if "$GITHUB_WORKFLOW" == "Autodocs" then /autodoc.bash else - echo "$INPUT_TEST1" - #"$GITHUB_WORKSPACE/ci/master.bash" $* + #echo "$INPUT_TEST1" + "$GITHUB_WORKSPACE/ci/master.bash" $INPUT_TEST1 fi From 93ab84836fed2d703f257ac6e40fd0a4d8ccebf9 Mon Sep 17 00:00:00 2001 From: r9pena Date: Wed, 14 Jul 2021 15:04:48 -0600 Subject: [PATCH 059/112] Test #9 --- .github/actions/entrypoint.sh | 2 +- .github/actions/github-ci-action.yml | 4 ++-- .github/workflows/build-test.yml | 27 +++++++++++++++++++++-- ci/master.bash | 33 ++++++++++++++++++++-------- 4 files changed, 52 insertions(+), 14 deletions(-) diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh index c91e217cb3..6c92bf62c7 100755 --- a/.github/actions/entrypoint.sh +++ b/.github/actions/entrypoint.sh @@ -9,5 +9,5 @@ then /autodoc.bash else #echo "$INPUT_TEST1" - "$GITHUB_WORKSPACE/ci/master.bash" $INPUT_TEST1 + "$GITHUB_WORKSPACE/ci/master.bash" $INPUT_TEST fi diff --git a/.github/actions/github-ci-action.yml b/.github/actions/github-ci-action.yml index c599cd01bc..8db57322d1 100644 --- a/.github/actions/github-ci-action.yml +++ b/.github/actions/github-ci-action.yml @@ -1,7 +1,7 @@ name: 'F prime CI' description: 'Runs continuous integration testing on F prime' inputs: - test1: + test: description: Test number to run required: true default: '1' @@ -9,4 +9,4 @@ runs: using: 'docker' image: 'Dockerfile' args: - - ${{ inputs.test1 }} + - ${{ inputs.test }} diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 27874cb6d8..bdabf82e73 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -13,7 +13,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - build: + build-20: # The type of runner that the job will run on runs-on: ubuntu-latest @@ -26,7 +26,7 @@ jobs: uses: ./.github/actions/ id: github-ci-action with: - test1: 'QUICK' + test: '20-fputil' # Archive the outputs - name: 'Archive Logs' uses: actions/upload-artifact@v2 @@ -35,3 +35,26 @@ jobs: name: ci-logs path: ci-logs.tar.gz retention-days: 5 + + build-30: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + # Runs the CI action internal to the repository + - name: F prime CI step + uses: ./.github/actions/ + id: github-ci-action + with: + test: '30-ints' + # Archive the outputs + - name: 'Archive Logs' + uses: actions/upload-artifact@v2 + if: always() + with: + name: ci-logs + path: ci-logs.tar.gz + retention-days: 5 \ No newline at end of file diff --git a/ci/master.bash b/ci/master.bash index 3eaac462ce..960c325e07 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -10,18 +10,33 @@ export SCRIPT_DIR="$(dirname ${BASH_SOURCE})" TESTS="${@}" export TEST_TYPE="FULL" -if (( $# == 0 )) || [[ "${TESTS}" == "FULL" ]] +if ( $# == 0 ) then - TESTS="$(ls "${SCRIPT_DIR}/tests"/*)" -elif [[ "${TESTS}" == "QUICK" ]] + echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" +elif [[ "${TESTS}" == "20-fputil" ]] then - TESTS="${SCRIPT_DIR}/tests/20-fputil.bash ${SCRIPT_DIR}/tests/30-ints.bash" - export TEST_TYPE="QUICK" -elif [[ "${TESTS}" == "STATIC" ]] + TESTS="${SCRIPT_DIR}/tests/20-fputil.bash" + export TEST_TYPE="20-fputil" +elif [[ "${TESTS}" == "30-ints" ]] then - TESTS="${SCRIPT_DIR}/tests/40-pylama.bash" - export TEST_TYPE="STATIC" -fi + TESTS="${SCRIPT_DIR}/tests/30-ints.bash" + export TEST_TYPE="30-ints" +fi + +# TESTS="${@}" +# export TEST_TYPE="FULL" +# if (( $# == 0 )) || [[ "${TESTS}" == "FULL" ]] +# then +# TESTS="$(ls "${SCRIPT_DIR}/tests"/*)" +# elif [[ "${TESTS}" == "QUICK" ]] +# then +# TESTS="${SCRIPT_DIR}/tests/20-fputil.bash ${SCRIPT_DIR}/tests/30-ints.bash" +# export TEST_TYPE="QUICK" +# elif [[ "${TESTS}" == "STATIC" ]] +# then +# TESTS="${SCRIPT_DIR}/tests/40-pylama.bash" +# export TEST_TYPE="STATIC" +# fi #### NEEDED ENVIRONMENT #### export FPRIME_DIR="$(cd ${SCRIPT_DIR}/..; pwd)" From b82555759888ad51aec8fc32cdfd24a238c394a4 Mon Sep 17 00:00:00 2001 From: r9pena Date: Thu, 15 Jul 2021 10:02:23 -0600 Subject: [PATCH 060/112] Test #10 --- ci/tests/20-fputil.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tests/20-fputil.bash b/ci/tests/20-fputil.bash index 4c6dbc2b45..f77b5cb582 100755 --- a/ci/tests/20-fputil.bash +++ b/ci/tests/20-fputil.bash @@ -26,12 +26,12 @@ do export CHECK_TARGET_PLATFORM="native" for target in "${FPUTIL_TARGETS[@]}" do - if [[ "${TEST_TYPE}" != "QUICK" ]] || [[ "${target}" == "generate" ]] + if [[ "${TEST_TYPE}" != "20-fputil" ]] || [[ "${target}" == "generate" ]] then rm -rf "${deployment}/build-fprime-automatic-"* fi fputil_action "${deployment}" "${target}" - if [[ "${TEST_TYPE}" != "QUICK" ]] + if [[ "${TEST_TYPE}" != "20-fputil" ]] then "${SCRIPT_DIR}/clean.bash" || fail_and_stop "Cleaning repository" fi From cd1f0c8da6234cf4a2e7b77a29a92930f5edb82d Mon Sep 17 00:00:00 2001 From: r9pena Date: Thu, 15 Jul 2021 10:15:21 -0600 Subject: [PATCH 061/112] Test #11 --- ci/tests/fputil.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 2f5633baed..2dd4838420 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -26,7 +26,7 @@ function fputil_action { PLATFORM="" # Generate is only needed when it isn't being tested - if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "QUICK" ]] + if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]] then echo "[INFO] Generating build cache before ${DEPLOYMENT//\//_} '${TARGET}' execution" fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.out.log" 2> "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.err.log" \ From 326bef622a86ea210674394d03e7ce57d67faf10 Mon Sep 17 00:00:00 2001 From: r9pena Date: Thu, 15 Jul 2021 10:35:34 -0600 Subject: [PATCH 062/112] Test #12 --- ci/tests/20-fputil.bash | 3 +++ ci/tests/fputil.bash | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/tests/20-fputil.bash b/ci/tests/20-fputil.bash index f77b5cb582..28b2f7586b 100755 --- a/ci/tests/20-fputil.bash +++ b/ci/tests/20-fputil.bash @@ -18,6 +18,7 @@ do continue fi # Check if RPI or Ref deployment to disable FRAMEWORK UTS + # RP - These are the only 2 deployments used by the 20-fputil CI if [[ "${deployment}" == */RPI ]] || [[ "${deployment}" == */Ref ]] then export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" @@ -26,11 +27,13 @@ do export CHECK_TARGET_PLATFORM="native" for target in "${FPUTIL_TARGETS[@]}" do + # RP - This if stmt is only used for the 20-fputil CI if [[ "${TEST_TYPE}" != "20-fputil" ]] || [[ "${target}" == "generate" ]] then rm -rf "${deployment}/build-fprime-automatic-"* fi fputil_action "${deployment}" "${target}" + # RP - This if stmt is only used for the 20-fputil CI if [[ "${TEST_TYPE}" != "20-fputil" ]] then "${SCRIPT_DIR}/clean.bash" || fail_and_stop "Cleaning repository" diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 2dd4838420..adb3ecf16e 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -56,7 +56,7 @@ function integration_test { export SLEEP_TIME="10" export WORKDIR="${1}" export ROOTDIR="${WORKDIR}/build-artifacts" - if [[ "${TEST_TYPE}" != "QUICK" ]] + if [[ "${TEST_TYPE}" != "30-fputil" ]] then fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" fi From b80827fd56cdb5935fda7175e2e36654e8965766 Mon Sep 17 00:00:00 2001 From: r9pena Date: Thu, 15 Jul 2021 12:35:48 -0600 Subject: [PATCH 063/112] Test #13 --- ci/tests/fputil.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index adb3ecf16e..9516b2e5a5 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -5,7 +5,7 @@ # Helpers to test via FP util #### export FPUTIL_TARGETS=("generate" "generate --ut" "build" "build --all" "check --all") -export FPUTIL_DEPLOYS="${FPRIME_DIR} ${FPRIME_DIR}/Ref ${FPRIME_DIR}/RPI" +export FPUTIL_DEPLOYS="${FPRIME_DIR}" #${FPRIME_DIR}/Ref ${FPRIME_DIR}/RPI" export INT_DEPLOYS="${FPRIME_DIR}/Ref" #### From 50c0cc3b429736ac5d849907ae8e5d49d7bd82ac Mon Sep 17 00:00:00 2001 From: r9pena Date: Thu, 15 Jul 2021 13:33:46 -0600 Subject: [PATCH 064/112] Test #14 --- .github/actions/Dockerfile | 4 ++-- ci/master.bash | 3 +++ ci/tests/fputil.bash | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile index 4208a81ae1..4d45133042 100644 --- a/.github/actions/Dockerfile +++ b/.github/actions/Dockerfile @@ -2,8 +2,8 @@ FROM nasafprime/fprime-base:latest # Copies your code file from your action repository to the filesystem path `/` of the container USER root -#RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ -# apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds +RUN apt-get update && apt-get install -y --no-install-recommends doxygen && \ + apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds COPY entrypoint.sh /entrypoint.sh COPY autodoc.bash /autodoc.bash USER fprime diff --git a/ci/master.bash b/ci/master.bash index 960c325e07..1f2998bd2d 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -43,6 +43,9 @@ export FPRIME_DIR="$(cd ${SCRIPT_DIR}/..; pwd)" export LOG_DIR="${FPRIME_DIR}/ci-logs-$(date +"%Y-%m-%dT%H%M%S")" mkdir -p "${LOG_DIR}" +#### +# RP - Remove after refactor. Tools should be installed in Docker image. +#### . "${SCRIPT_DIR}/bootstrap.bash" # Loop through all scripts in tests directory and run them diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 9516b2e5a5..adb3ecf16e 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -5,7 +5,7 @@ # Helpers to test via FP util #### export FPUTIL_TARGETS=("generate" "generate --ut" "build" "build --all" "check --all") -export FPUTIL_DEPLOYS="${FPRIME_DIR}" #${FPRIME_DIR}/Ref ${FPRIME_DIR}/RPI" +export FPUTIL_DEPLOYS="${FPRIME_DIR} ${FPRIME_DIR}/Ref ${FPRIME_DIR}/RPI" export INT_DEPLOYS="${FPRIME_DIR}/Ref" #### From ebe155d5ce5cd3d418df02acc22843a87826c3cc Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 08:26:26 -0600 Subject: [PATCH 065/112] Test #15 --- .github/workflows/build-test.yml | 27 +++++++++++++++++++++++-- ci/master.bash | 34 +++++++++++++++++++------------- ci/tests/fputil.bash | 4 ++-- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index bdabf82e73..81e519b3fd 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -13,7 +13,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - build-20: + Ref: # The type of runner that the job will run on runs-on: ubuntu-latest @@ -26,7 +26,30 @@ jobs: uses: ./.github/actions/ id: github-ci-action with: - test: '20-fputil' + test: 'Ref' + # Archive the outputs + - name: 'Archive Logs' + uses: actions/upload-artifact@v2 + if: always() + with: + name: ci-logs + path: ci-logs.tar.gz + retention-days: 5 + + RPI: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + # Runs the CI action internal to the repository + - name: F prime CI step + uses: ./.github/actions/ + id: github-ci-action + with: + test: 'RPI' # Archive the outputs - name: 'Archive Logs' uses: actions/upload-artifact@v2 diff --git a/ci/master.bash b/ci/master.bash index 1f2998bd2d..f8411e7dbc 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -8,18 +8,19 @@ export CTEST_OUTPUT_ON_FAILURE=1 export SCRIPT_DIR="$(dirname ${BASH_SOURCE})" . "${SCRIPT_DIR}/helpers.bash" -TESTS="${@}" +TEST="${@}" export TEST_TYPE="FULL" if ( $# == 0 ) then echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" -elif [[ "${TESTS}" == "20-fputil" ]] +elif [[ "${TEST}" == "Ref" ] || [ "${TEST}" == "RPI" ]] then - TESTS="${SCRIPT_DIR}/tests/20-fputil.bash" - export TEST_TYPE="20-fputil" -elif [[ "${TESTS}" == "30-ints" ]] + export TEST_TYPE = "${TEST}" + TEST="${SCRIPT_DIR}/tests/20-fputil.bash" + #export TEST_TYPE="20-fputil" +elif [[ "${TEST}" == "30-ints" ]] then - TESTS="${SCRIPT_DIR}/tests/30-ints.bash" + TEST="${SCRIPT_DIR}/tests/30-ints.bash" export TEST_TYPE="30-ints" fi @@ -46,14 +47,19 @@ mkdir -p "${LOG_DIR}" #### # RP - Remove after refactor. Tools should be installed in Docker image. #### -. "${SCRIPT_DIR}/bootstrap.bash" +# . "${SCRIPT_DIR}/bootstrap.bash" + +echo -e "${BLUE}Starting CI test ${TEST}${NOCOLOR}" +/usr/bin/time "${TEST}" || fail_and_stop "${TEST} failed" +echo -e "${GREEN}CI test ${TEST} SUCCESSFUL${NOCOLOR}" + # Loop through all scripts in tests directory and run them -for test_script in ${TESTS} -do - "${SCRIPT_DIR}/clean.bash" || fail_and_stop "Cleaning directory" - echo -e "${BLUE}Starting CI test ${test_script}${NOCOLOR}" - /usr/bin/time "${test_script}" || fail_and_stop "${test_script} failed" - echo -e "${GREEN}CI test ${test_script} SUCCESSFUL${NOCOLOR}" -done +# for test_script in ${TESTS} +# do +# # "${SCRIPT_DIR}/clean.bash" || fail_and_stop "Cleaning directory" +# echo -e "${BLUE}Starting CI test ${test_script}${NOCOLOR}" +# /usr/bin/time "${test_script}" || fail_and_stop "${test_script} failed" +# echo -e "${GREEN}CI test ${test_script} SUCCESSFUL${NOCOLOR}" +# done archive_logs diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index adb3ecf16e..6134c68373 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -5,8 +5,8 @@ # Helpers to test via FP util #### export FPUTIL_TARGETS=("generate" "generate --ut" "build" "build --all" "check --all") -export FPUTIL_DEPLOYS="${FPRIME_DIR} ${FPRIME_DIR}/Ref ${FPRIME_DIR}/RPI" - +# export FPUTIL_DEPLOYS="${FPRIME_DIR} ${FPRIME_DIR}/Ref ${FPRIME_DIR}/RPI" +export FPUTIL_DEPLOYS="${FPRIME_DIR}/${TEST_TYPE}" export INT_DEPLOYS="${FPRIME_DIR}/Ref" #### # fputil_action: From d01f825b93768f70459f2b306c8719a8baf92857 Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 08:38:26 -0600 Subject: [PATCH 066/112] Test #16 --- ci/master.bash | 6 +-- ci/tests/20-fputil.bash | 81 +++++++++++++++++++++++++++-------------- ci/tests/fputil.bash | 2 +- 3 files changed, 57 insertions(+), 32 deletions(-) diff --git a/ci/master.bash b/ci/master.bash index f8411e7dbc..44144a3fab 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -13,11 +13,11 @@ export TEST_TYPE="FULL" if ( $# == 0 ) then echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" -elif [[ "${TEST}" == "Ref" ] || [ "${TEST}" == "RPI" ]] +elif [[ "${TEST}" == "Ref" ]] || [[ "${TEST}" == "RPI" ]] then - export TEST_TYPE = "${TEST}" + export DEPLOYMENT = "${TEST}" TEST="${SCRIPT_DIR}/tests/20-fputil.bash" - #export TEST_TYPE="20-fputil" + export TEST_TYPE="20-fputil" elif [[ "${TEST}" == "30-ints" ]] then TEST="${SCRIPT_DIR}/tests/30-ints.bash" diff --git a/ci/tests/20-fputil.bash b/ci/tests/20-fputil.bash index 28b2f7586b..10fee95a18 100755 --- a/ci/tests/20-fputil.bash +++ b/ci/tests/20-fputil.bash @@ -8,35 +8,60 @@ export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" . ${SCRIPT_DIR}/tests/fputil.bash -# Loop over deployments and targets -for deployment in ${FPUTIL_DEPLOYS} + +export CMAKE_EXTRA_SETTINGS="" +if [[ "${FPUTIL_DEPLOYS}" == */RPI ]] && [ ! -d "/opt/rpi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf" ] +then + warn_and_cont "RPI tools not installed, refusing to test." + continue +fi +# Check if RPI or Ref deployment to disable FRAMEWORK UTS +# RP - These are the only 2 deployments used by the 20-fputil CI +if [[ "${FPUTIL_DEPLOYS}" == */RPI ]] || [[ "${FPUTIL_DEPLOYS}" == */Ref ]] +then + export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" +fi +echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" +export CHECK_TARGET_PLATFORM="native" +for target in "${FPUTIL_TARGETS[@]}" do - export CMAKE_EXTRA_SETTINGS="" - if [[ "${deployment}" == */RPI ]] && [ ! -d "/opt/rpi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf" ] + # RP - This if stmt is only used for the 20-fputil CI + if [[ "${target}" == "generate" ]] then - warn_and_cont "RPI tools not installed, refusing to test." - continue + rm -rf "${deployment}/build-fprime-automatic-"* fi - # Check if RPI or Ref deployment to disable FRAMEWORK UTS - # RP - These are the only 2 deployments used by the 20-fputil CI - if [[ "${deployment}" == */RPI ]] || [[ "${deployment}" == */Ref ]] - then - export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" - fi - echo -e "${BLUE}Testing ${deployment} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" - export CHECK_TARGET_PLATFORM="native" - for target in "${FPUTIL_TARGETS[@]}" - do - # RP - This if stmt is only used for the 20-fputil CI - if [[ "${TEST_TYPE}" != "20-fputil" ]] || [[ "${target}" == "generate" ]] - then - rm -rf "${deployment}/build-fprime-automatic-"* - fi - fputil_action "${deployment}" "${target}" - # RP - This if stmt is only used for the 20-fputil CI - if [[ "${TEST_TYPE}" != "20-fputil" ]] - then - "${SCRIPT_DIR}/clean.bash" || fail_and_stop "Cleaning repository" - fi - done + fputil_action "${deployment}" "${target}" done + +# Loop over deployments and targets +# for deployment in ${FPUTIL_DEPLOYS} +# do +# export CMAKE_EXTRA_SETTINGS="" +# if [[ "${deployment}" == */RPI ]] && [ ! -d "/opt/rpi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf" ] +# then +# warn_and_cont "RPI tools not installed, refusing to test." +# continue +# fi +# # Check if RPI or Ref deployment to disable FRAMEWORK UTS +# # RP - These are the only 2 deployments used by the 20-fputil CI +# if [[ "${deployment}" == */RPI ]] || [[ "${deployment}" == */Ref ]] +# then +# export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" +# fi +# echo -e "${BLUE}Testing ${deployment} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" +# export CHECK_TARGET_PLATFORM="native" +# for target in "${FPUTIL_TARGETS[@]}" +# do +# # RP - This if stmt is only used for the 20-fputil CI +# if [[ "${TEST_TYPE}" != "20-fputil" ]] || [[ "${target}" == "generate" ]] +# then +# rm -rf "${deployment}/build-fprime-automatic-"* +# fi +# fputil_action "${deployment}" "${target}" +# # RP - This if stmt is only used for the 20-fputil CI +# if [[ "${TEST_TYPE}" != "20-fputil" ]] +# then +# "${SCRIPT_DIR}/clean.bash" || fail_and_stop "Cleaning repository" +# fi +# done +# done diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 6134c68373..b2d7a2693c 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -6,7 +6,7 @@ #### export FPUTIL_TARGETS=("generate" "generate --ut" "build" "build --all" "check --all") # export FPUTIL_DEPLOYS="${FPRIME_DIR} ${FPRIME_DIR}/Ref ${FPRIME_DIR}/RPI" -export FPUTIL_DEPLOYS="${FPRIME_DIR}/${TEST_TYPE}" +export FPUTIL_DEPLOYS="${FPRIME_DIR}/${DEPLOYMENT}" export INT_DEPLOYS="${FPRIME_DIR}/Ref" #### # fputil_action: From 55f9c794dc2dbd71c4fbeb76c715e5f64cb0a6a4 Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 08:47:24 -0600 Subject: [PATCH 067/112] Test #17 --- ci/master.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/master.bash b/ci/master.bash index 44144a3fab..cc0cb15ad3 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -8,17 +8,17 @@ export CTEST_OUTPUT_ON_FAILURE=1 export SCRIPT_DIR="$(dirname ${BASH_SOURCE})" . "${SCRIPT_DIR}/helpers.bash" -TEST="${@}" +DEPLOYMENT="${@}" export TEST_TYPE="FULL" if ( $# == 0 ) then echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" -elif [[ "${TEST}" == "Ref" ]] || [[ "${TEST}" == "RPI" ]] +elif [[ "${DEPLOYMENT}" == "Ref" ]] || [[ "${DEPLOYMENT}" == "RPI" ]] then - export DEPLOYMENT = "${TEST}" + export DEPLOYMENT TEST="${SCRIPT_DIR}/tests/20-fputil.bash" export TEST_TYPE="20-fputil" -elif [[ "${TEST}" == "30-ints" ]] +elif [[ "${DEPLOYMENT}" == "30-ints" ]] then TEST="${SCRIPT_DIR}/tests/30-ints.bash" export TEST_TYPE="30-ints" From 32d4de7e9cc1a6c7ce33e96427747c4a4bfe3440 Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 08:54:49 -0600 Subject: [PATCH 068/112] Test #18 --- ci/master.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/master.bash b/ci/master.bash index cc0cb15ad3..deedac8df1 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -10,10 +10,7 @@ export SCRIPT_DIR="$(dirname ${BASH_SOURCE})" DEPLOYMENT="${@}" export TEST_TYPE="FULL" -if ( $# == 0 ) -then - echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" -elif [[ "${DEPLOYMENT}" == "Ref" ]] || [[ "${DEPLOYMENT}" == "RPI" ]] +if [[ "${DEPLOYMENT}" == "Ref" ]] || [[ "${DEPLOYMENT}" == "RPI" ]] then export DEPLOYMENT TEST="${SCRIPT_DIR}/tests/20-fputil.bash" @@ -22,6 +19,9 @@ elif [[ "${DEPLOYMENT}" == "30-ints" ]] then TEST="${SCRIPT_DIR}/tests/30-ints.bash" export TEST_TYPE="30-ints" +else +then + echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" fi # TESTS="${@}" From bf86771a1cd56f6004bde84671d5725b2bc78c41 Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 09:03:18 -0600 Subject: [PATCH 069/112] Test #20 --- ci/master.bash | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/master.bash b/ci/master.bash index deedac8df1..d662657531 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -20,7 +20,6 @@ then TEST="${SCRIPT_DIR}/tests/30-ints.bash" export TEST_TYPE="30-ints" else -then echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" fi From 7414f1b1b5b2284b14b7856dc569bd9a23f6bff5 Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 09:15:56 -0600 Subject: [PATCH 070/112] Test #21 --- ci/master.bash | 3 +-- ci/tests/20-fputil.bash | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/master.bash b/ci/master.bash index d662657531..e828ef4066 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -8,11 +8,10 @@ export CTEST_OUTPUT_ON_FAILURE=1 export SCRIPT_DIR="$(dirname ${BASH_SOURCE})" . "${SCRIPT_DIR}/helpers.bash" -DEPLOYMENT="${@}" +export DEPLOYMENT="${@}" export TEST_TYPE="FULL" if [[ "${DEPLOYMENT}" == "Ref" ]] || [[ "${DEPLOYMENT}" == "RPI" ]] then - export DEPLOYMENT TEST="${SCRIPT_DIR}/tests/20-fputil.bash" export TEST_TYPE="20-fputil" elif [[ "${DEPLOYMENT}" == "30-ints" ]] diff --git a/ci/tests/20-fputil.bash b/ci/tests/20-fputil.bash index 10fee95a18..447d2fc042 100755 --- a/ci/tests/20-fputil.bash +++ b/ci/tests/20-fputil.bash @@ -28,9 +28,9 @@ do # RP - This if stmt is only used for the 20-fputil CI if [[ "${target}" == "generate" ]] then - rm -rf "${deployment}/build-fprime-automatic-"* + rm -rf "${DEPLOYMENT}/build-fprime-automatic-"* fi - fputil_action "${deployment}" "${target}" + fputil_action "${DEPLOYMENT}" "${target}" done # Loop over deployments and targets From 442807d39dc82286f07646102d07869028f0e60c Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 09:33:14 -0600 Subject: [PATCH 071/112] Test #22 --- ci/master.bash | 16 ++++++++-------- ci/tests/20-fputil.bash | 4 ++-- ci/tests/fputil.bash | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ci/master.bash b/ci/master.bash index e828ef4066..99d9af1889 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -8,15 +8,15 @@ export CTEST_OUTPUT_ON_FAILURE=1 export SCRIPT_DIR="$(dirname ${BASH_SOURCE})" . "${SCRIPT_DIR}/helpers.bash" -export DEPLOYMENT="${@}" +export TEST="${@}" export TEST_TYPE="FULL" -if [[ "${DEPLOYMENT}" == "Ref" ]] || [[ "${DEPLOYMENT}" == "RPI" ]] +if [[ "${TEST}" == "Ref" ]] || [[ "${TEST}" == "RPI" ]] then - TEST="${SCRIPT_DIR}/tests/20-fputil.bash" + TEST_RUN="${SCRIPT_DIR}/tests/20-fputil.bash" export TEST_TYPE="20-fputil" -elif [[ "${DEPLOYMENT}" == "30-ints" ]] +elif [[ "${TEST}" == "30-ints" ]] then - TEST="${SCRIPT_DIR}/tests/30-ints.bash" + TEST_RUN="${SCRIPT_DIR}/tests/30-ints.bash" export TEST_TYPE="30-ints" else echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" @@ -47,9 +47,9 @@ mkdir -p "${LOG_DIR}" #### # . "${SCRIPT_DIR}/bootstrap.bash" -echo -e "${BLUE}Starting CI test ${TEST}${NOCOLOR}" -/usr/bin/time "${TEST}" || fail_and_stop "${TEST} failed" -echo -e "${GREEN}CI test ${TEST} SUCCESSFUL${NOCOLOR}" +echo -e "${BLUE}Starting CI test ${TEST_RUN}${NOCOLOR}" +/usr/bin/time "${TEST_RUN}" || fail_and_stop "${TEST} failed" +echo -e "${GREEN}CI test ${TEST_RUN} SUCCESSFUL${NOCOLOR}" # Loop through all scripts in tests directory and run them diff --git a/ci/tests/20-fputil.bash b/ci/tests/20-fputil.bash index 447d2fc042..2ef60563bb 100755 --- a/ci/tests/20-fputil.bash +++ b/ci/tests/20-fputil.bash @@ -28,9 +28,9 @@ do # RP - This if stmt is only used for the 20-fputil CI if [[ "${target}" == "generate" ]] then - rm -rf "${DEPLOYMENT}/build-fprime-automatic-"* + rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* fi - fputil_action "${DEPLOYMENT}" "${target}" + fputil_action "${FPUTIL_DEPLOYS}" "${target}" done # Loop over deployments and targets diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index b2d7a2693c..c5635bec33 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -6,7 +6,7 @@ #### export FPUTIL_TARGETS=("generate" "generate --ut" "build" "build --all" "check --all") # export FPUTIL_DEPLOYS="${FPRIME_DIR} ${FPRIME_DIR}/Ref ${FPRIME_DIR}/RPI" -export FPUTIL_DEPLOYS="${FPRIME_DIR}/${DEPLOYMENT}" +export FPUTIL_DEPLOYS="${FPRIME_DIR}/${TEST}" export INT_DEPLOYS="${FPRIME_DIR}/Ref" #### # fputil_action: From 322d7ced9cc612e6f672df5c0842b84d97f63c53 Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 10:16:27 -0600 Subject: [PATCH 072/112] Test #23 --- ci/master.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/master.bash b/ci/master.bash index 99d9af1889..f9b16a6649 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -45,7 +45,7 @@ mkdir -p "${LOG_DIR}" #### # RP - Remove after refactor. Tools should be installed in Docker image. #### -# . "${SCRIPT_DIR}/bootstrap.bash" +. "${SCRIPT_DIR}/bootstrap.bash" echo -e "${BLUE}Starting CI test ${TEST_RUN}${NOCOLOR}" /usr/bin/time "${TEST_RUN}" || fail_and_stop "${TEST} failed" From f0a2f16eeda07c845a55aec10d48da76cb07f5d1 Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 10:33:22 -0600 Subject: [PATCH 073/112] Test #24 --- ci/tests/20-fputil.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/tests/20-fputil.bash b/ci/tests/20-fputil.bash index 2ef60563bb..ab8551e70c 100755 --- a/ci/tests/20-fputil.bash +++ b/ci/tests/20-fputil.bash @@ -25,12 +25,15 @@ echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_ export CHECK_TARGET_PLATFORM="native" for target in "${FPUTIL_TARGETS[@]}" do + START="$(date +%s)" # RP - This if stmt is only used for the 20-fputil CI if [[ "${target}" == "generate" ]] then rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* fi fputil_action "${FPUTIL_DEPLOYS}" "${target}" + END="$(date +%s)" + echo "$[${END} - ${START}]" done # Loop over deployments and targets From 8bf818a044cb35bd668e41b0c29c84d5e5236f8c Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 10:54:29 -0600 Subject: [PATCH 074/112] Test #25 --- .github/actions/github-ci-action.yml | 2 +- .github/workflows/build-test.yml | 23 +++++++++++++++++++++++ ci/master.bash | 4 ++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.github/actions/github-ci-action.yml b/.github/actions/github-ci-action.yml index 8db57322d1..369acf5afa 100644 --- a/.github/actions/github-ci-action.yml +++ b/.github/actions/github-ci-action.yml @@ -4,7 +4,7 @@ inputs: test: description: Test number to run required: true - default: '1' + default: '' runs: using: 'docker' image: 'Dockerfile' diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 81e519b3fd..27e499606c 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -13,6 +13,29 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" + Framework: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + # Runs the CI action internal to the repository + - name: F prime CI step + uses: ./.github/actions/ + id: github-ci-action + with: + test: '' + # Archive the outputs + - name: 'Archive Logs' + uses: actions/upload-artifact@v2 + if: always() + with: + name: ci-logs + path: ci-logs.tar.gz + retention-days: 5 + Ref: # The type of runner that the job will run on runs-on: ubuntu-latest diff --git a/ci/master.bash b/ci/master.bash index f9b16a6649..e113188fc8 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -10,7 +10,7 @@ export SCRIPT_DIR="$(dirname ${BASH_SOURCE})" export TEST="${@}" export TEST_TYPE="FULL" -if [[ "${TEST}" == "Ref" ]] || [[ "${TEST}" == "RPI" ]] +if [[ "${TEST}" == "" ]] || [[ "${TEST}" == "Ref" ]] || [[ "${TEST}" == "RPI" ]] then TEST_RUN="${SCRIPT_DIR}/tests/20-fputil.bash" export TEST_TYPE="20-fputil" @@ -45,7 +45,7 @@ mkdir -p "${LOG_DIR}" #### # RP - Remove after refactor. Tools should be installed in Docker image. #### -. "${SCRIPT_DIR}/bootstrap.bash" +# . "${SCRIPT_DIR}/bootstrap.bash" echo -e "${BLUE}Starting CI test ${TEST_RUN}${NOCOLOR}" /usr/bin/time "${TEST_RUN}" || fail_and_stop "${TEST} failed" From 5ad6d7733103f74dfb829e252cb161c431333ea1 Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 14:50:13 -0600 Subject: [PATCH 075/112] Split test files --- .github/workflows/build-test.yml | 4 ++-- ci/master.bash | 31 ++++++++++++++++-------------- ci/tests/Framework.bash | 25 ++++++++++++++++++++++++ ci/tests/RPI.bash | 33 ++++++++++++++++++++++++++++++++ ci/tests/Ref.bash | 29 ++++++++++++++++++++++++++++ ci/tests/fputil.bash | 20 +++++++++---------- 6 files changed, 116 insertions(+), 26 deletions(-) create mode 100644 ci/tests/Framework.bash create mode 100644 ci/tests/RPI.bash create mode 100644 ci/tests/Ref.bash diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 27e499606c..db3dca745f 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: uses: ./.github/actions/ id: github-ci-action with: - test: '' + test: Framework # Archive the outputs - name: 'Archive Logs' uses: actions/upload-artifact@v2 @@ -82,7 +82,7 @@ jobs: path: ci-logs.tar.gz retention-days: 5 - build-30: + Integration: # The type of runner that the job will run on runs-on: ubuntu-latest diff --git a/ci/master.bash b/ci/master.bash index e113188fc8..5f825bc918 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -9,18 +9,20 @@ export SCRIPT_DIR="$(dirname ${BASH_SOURCE})" . "${SCRIPT_DIR}/helpers.bash" export TEST="${@}" -export TEST_TYPE="FULL" -if [[ "${TEST}" == "" ]] || [[ "${TEST}" == "Ref" ]] || [[ "${TEST}" == "RPI" ]] -then - TEST_RUN="${SCRIPT_DIR}/tests/20-fputil.bash" - export TEST_TYPE="20-fputil" -elif [[ "${TEST}" == "30-ints" ]] -then - TEST_RUN="${SCRIPT_DIR}/tests/30-ints.bash" - export TEST_TYPE="30-ints" -else - echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" -fi +TEST_RUN="${SCRIPT_DIR}/tests/${TEST}.bash" +export TEST_TYPE="${TEST}" + +# if [[ "${TEST}" == "" ]] || [[ "${TEST}" == "Ref" ]] || [[ "${TEST}" == "RPI" ]] +# then +# TEST_RUN="${SCRIPT_DIR}/tests/20-fputil.bash" +# export TEST_TYPE="20-fputil" +# elif [[ "${TEST}" == "30-ints" ]] +# then +# TEST_RUN="${SCRIPT_DIR}/tests/30-ints.bash" +# export TEST_TYPE="30-ints" +# else +# echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" +# fi # TESTS="${@}" # export TEST_TYPE="FULL" @@ -47,9 +49,10 @@ mkdir -p "${LOG_DIR}" #### # . "${SCRIPT_DIR}/bootstrap.bash" -echo -e "${BLUE}Starting CI test ${TEST_RUN}${NOCOLOR}" +# Run the test script +echo -e "${BLUE}Starting CI test ${TEST_RUN} ${TEST}${NOCOLOR}" /usr/bin/time "${TEST_RUN}" || fail_and_stop "${TEST} failed" -echo -e "${GREEN}CI test ${TEST_RUN} SUCCESSFUL${NOCOLOR}" +echo -e "${GREEN}CI test ${TEST_RUN} ${TEST} SUCCESSFUL${NOCOLOR}" # Loop through all scripts in tests directory and run them diff --git a/ci/tests/Framework.bash b/ci/tests/Framework.bash new file mode 100644 index 0000000000..53fd4b7ebf --- /dev/null +++ b/ci/tests/Framework.bash @@ -0,0 +1,25 @@ +#!/bin/bash +#### +# Framework.bash: +# +# Run the tests on the software through fp-util. +#### +export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." +. "${SCRIPT_DIR}/helpers.bash" + +. ${SCRIPT_DIR}/tests/fputil.bash + +export CMAKE_EXTRA_SETTINGS="" +echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" +export CHECK_TARGET_PLATFORM="native" +for target in "${FPUTIL_TARGETS[@]}" +do + START="$(date +%s)" + if [[ "${target}" == "generate" ]] + then + rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* + fi + fputil_action "${FPUTIL_DEPLOYS}" "${target}" + END="$(date +%s)" + echo "$[${END} - ${START}]" +done \ No newline at end of file diff --git a/ci/tests/RPI.bash b/ci/tests/RPI.bash new file mode 100644 index 0000000000..a77c7da6dd --- /dev/null +++ b/ci/tests/RPI.bash @@ -0,0 +1,33 @@ +#!/bin/bash +#### +# RPI.bash: +# +# Run the tests on the software through fp-util. +#### +export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." +. "${SCRIPT_DIR}/helpers.bash" + +. ${SCRIPT_DIR}/tests/fputil.bash + +export CMAKE_EXTRA_SETTINGS="" +if [ ! -d "/opt/rpi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf" ] +then + warn_and_cont "RPI tools not installed, refusing to test." + continue +fi +# For RPI deployment to disable FRAMEWORK UTS +export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" + +echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" +export CHECK_TARGET_PLATFORM="native" +for target in "${FPUTIL_TARGETS[@]}" +do + START="$(date +%s)" + if [[ "${target}" == "generate" ]] + then + rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* + fi + fputil_action "${FPUTIL_DEPLOYS}" "${target}" + END="$(date +%s)" + echo "$[${END} - ${START}]" +done \ No newline at end of file diff --git a/ci/tests/Ref.bash b/ci/tests/Ref.bash new file mode 100644 index 0000000000..17d61266b4 --- /dev/null +++ b/ci/tests/Ref.bash @@ -0,0 +1,29 @@ +#!/bin/bash +#### +# ref.bash: +# +# Run the tests on the software through fp-util. +#### + +export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." +. "${SCRIPT_DIR}/helpers.bash" + +. ${SCRIPT_DIR}/tests/fputil.bash + +export CMAKE_EXTRA_SETTINGS="" +# For Ref deployment to disable FRAMEWORK UTS +export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" + +echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" +export CHECK_TARGET_PLATFORM="native" +for target in "${FPUTIL_TARGETS[@]}" +do + START="$(date +%s)" + if [[ "${target}" == "generate" ]] + then + rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* + fi + fputil_action "${FPUTIL_DEPLOYS}" "${target}" + END="$(date +%s)" + echo "$[${END} - ${START}]" +done \ No newline at end of file diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index c5635bec33..2957ffa28a 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -26,12 +26,12 @@ function fputil_action { PLATFORM="" # Generate is only needed when it isn't being tested - if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]] - then - echo "[INFO] Generating build cache before ${DEPLOYMENT//\//_} '${TARGET}' execution" - fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.out.log" 2> "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.err.log" \ - || fail_and_stop "Failed to generate before ${DEPLOYMENT//\//_} '${TARGET}' execution" - fi + # if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]] + # then + # echo "[INFO] Generating build cache before ${DEPLOYMENT//\//_} '${TARGET}' execution" + # fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.out.log" 2> "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.err.log" \ + # || fail_and_stop "Failed to generate before ${DEPLOYMENT//\//_} '${TARGET}' execution" + # fi cd "${WORKDIR}" if [[ "${TARGET}" != "generate" ]] && [[ "${TARGET}" != "generate --ut" ]] then @@ -56,10 +56,10 @@ function integration_test { export SLEEP_TIME="10" export WORKDIR="${1}" export ROOTDIR="${WORKDIR}/build-artifacts" - if [[ "${TEST_TYPE}" != "30-fputil" ]] - then - fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" - fi + # if [[ "${TEST_TYPE}" != "30-fputil" ]] + # then + # fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" + # fi ( mkdir -p "${LOG_DIR}/gds-logs" # Start the GDS layer and give it time to run From 87da67301effb23e4d6a0db50398f1866dec6d3e Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 15:02:57 -0600 Subject: [PATCH 076/112] Split tests #2 --- ci/tests/Framework.bash | 1 + ci/tests/RPI.bash | 1 + ci/tests/Ref.bash | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/tests/Framework.bash b/ci/tests/Framework.bash index 53fd4b7ebf..2ed160bb81 100644 --- a/ci/tests/Framework.bash +++ b/ci/tests/Framework.bash @@ -4,6 +4,7 @@ # # Run the tests on the software through fp-util. #### + export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" diff --git a/ci/tests/RPI.bash b/ci/tests/RPI.bash index a77c7da6dd..ef86b87dfa 100644 --- a/ci/tests/RPI.bash +++ b/ci/tests/RPI.bash @@ -4,6 +4,7 @@ # # Run the tests on the software through fp-util. #### + export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" diff --git a/ci/tests/Ref.bash b/ci/tests/Ref.bash index 17d61266b4..b70741873d 100644 --- a/ci/tests/Ref.bash +++ b/ci/tests/Ref.bash @@ -1,6 +1,6 @@ #!/bin/bash #### -# ref.bash: +# Ref.bash: # # Run the tests on the software through fp-util. #### From 0b04c18a7497bf7f9cebe958afd7dfd621e49094 Mon Sep 17 00:00:00 2001 From: r9-pena <55148641+r9-pena@users.noreply.github.com> Date: Tue, 20 Jul 2021 15:20:41 -0600 Subject: [PATCH 077/112] Added executable permissions From 03e3871303e408ddcff8cef8aed443167ec79aee Mon Sep 17 00:00:00 2001 From: r9-pena <55148641+r9-pena@users.noreply.github.com> Date: Tue, 20 Jul 2021 18:22:09 -0600 Subject: [PATCH 078/112] Delete RPI.bash --- ci/tests/RPI.bash | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 ci/tests/RPI.bash diff --git a/ci/tests/RPI.bash b/ci/tests/RPI.bash deleted file mode 100644 index ef86b87dfa..0000000000 --- a/ci/tests/RPI.bash +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -#### -# RPI.bash: -# -# Run the tests on the software through fp-util. -#### - -export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." -. "${SCRIPT_DIR}/helpers.bash" - -. ${SCRIPT_DIR}/tests/fputil.bash - -export CMAKE_EXTRA_SETTINGS="" -if [ ! -d "/opt/rpi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf" ] -then - warn_and_cont "RPI tools not installed, refusing to test." - continue -fi -# For RPI deployment to disable FRAMEWORK UTS -export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" - -echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" -export CHECK_TARGET_PLATFORM="native" -for target in "${FPUTIL_TARGETS[@]}" -do - START="$(date +%s)" - if [[ "${target}" == "generate" ]] - then - rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* - fi - fputil_action "${FPUTIL_DEPLOYS}" "${target}" - END="$(date +%s)" - echo "$[${END} - ${START}]" -done \ No newline at end of file From cf8aa08d7ba97fbbb6abd85bcbf235b9092556bf Mon Sep 17 00:00:00 2001 From: r9-pena <55148641+r9-pena@users.noreply.github.com> Date: Tue, 20 Jul 2021 18:22:17 -0600 Subject: [PATCH 079/112] Delete Ref.bash --- ci/tests/Ref.bash | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 ci/tests/Ref.bash diff --git a/ci/tests/Ref.bash b/ci/tests/Ref.bash deleted file mode 100644 index b70741873d..0000000000 --- a/ci/tests/Ref.bash +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -#### -# Ref.bash: -# -# Run the tests on the software through fp-util. -#### - -export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." -. "${SCRIPT_DIR}/helpers.bash" - -. ${SCRIPT_DIR}/tests/fputil.bash - -export CMAKE_EXTRA_SETTINGS="" -# For Ref deployment to disable FRAMEWORK UTS -export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" - -echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" -export CHECK_TARGET_PLATFORM="native" -for target in "${FPUTIL_TARGETS[@]}" -do - START="$(date +%s)" - if [[ "${target}" == "generate" ]] - then - rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* - fi - fputil_action "${FPUTIL_DEPLOYS}" "${target}" - END="$(date +%s)" - echo "$[${END} - ${START}]" -done \ No newline at end of file From 8e92aef86243fed4dc3f2f06398cf7633446f3de Mon Sep 17 00:00:00 2001 From: r9-pena <55148641+r9-pena@users.noreply.github.com> Date: Tue, 20 Jul 2021 18:22:25 -0600 Subject: [PATCH 080/112] Delete Framework.bash --- ci/tests/Framework.bash | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 ci/tests/Framework.bash diff --git a/ci/tests/Framework.bash b/ci/tests/Framework.bash deleted file mode 100644 index 2ed160bb81..0000000000 --- a/ci/tests/Framework.bash +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -#### -# Framework.bash: -# -# Run the tests on the software through fp-util. -#### - -export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." -. "${SCRIPT_DIR}/helpers.bash" - -. ${SCRIPT_DIR}/tests/fputil.bash - -export CMAKE_EXTRA_SETTINGS="" -echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" -export CHECK_TARGET_PLATFORM="native" -for target in "${FPUTIL_TARGETS[@]}" -do - START="$(date +%s)" - if [[ "${target}" == "generate" ]] - then - rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* - fi - fputil_action "${FPUTIL_DEPLOYS}" "${target}" - END="$(date +%s)" - echo "$[${END} - ${START}]" -done \ No newline at end of file From 74f1eb07690e1849314d920671f2d9f41d0406a8 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Tue, 20 Jul 2021 18:27:50 -0600 Subject: [PATCH 081/112] exe files --- ci/tests/Framework.bash | 1 - ci/tests/RPI.bash | 1 - ci/tests/Ref.bash | 1 - 3 files changed, 3 deletions(-) diff --git a/ci/tests/Framework.bash b/ci/tests/Framework.bash index 2ed160bb81..53fd4b7ebf 100644 --- a/ci/tests/Framework.bash +++ b/ci/tests/Framework.bash @@ -4,7 +4,6 @@ # # Run the tests on the software through fp-util. #### - export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" diff --git a/ci/tests/RPI.bash b/ci/tests/RPI.bash index ef86b87dfa..a77c7da6dd 100644 --- a/ci/tests/RPI.bash +++ b/ci/tests/RPI.bash @@ -4,7 +4,6 @@ # # Run the tests on the software through fp-util. #### - export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" diff --git a/ci/tests/Ref.bash b/ci/tests/Ref.bash index b70741873d..fc96d06fd2 100644 --- a/ci/tests/Ref.bash +++ b/ci/tests/Ref.bash @@ -4,7 +4,6 @@ # # Run the tests on the software through fp-util. #### - export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" From e92e71454aa0a0a70a37db53fa25d4d1878b33c2 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Tue, 20 Jul 2021 18:36:48 -0600 Subject: [PATCH 082/112] Make Framework.bash executable --- ci/tests/Framework.bash | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 ci/tests/Framework.bash diff --git a/ci/tests/Framework.bash b/ci/tests/Framework.bash old mode 100644 new mode 100755 From a79165be39344969f80f319d1f6599da9588ec64 Mon Sep 17 00:00:00 2001 From: r9-pena Date: Tue, 20 Jul 2021 18:40:47 -0600 Subject: [PATCH 083/112] Make RPI.bash and Ref.bash executable --- ci/tests/RPI.bash | 0 ci/tests/Ref.bash | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 ci/tests/RPI.bash mode change 100644 => 100755 ci/tests/Ref.bash diff --git a/ci/tests/RPI.bash b/ci/tests/RPI.bash old mode 100644 new mode 100755 diff --git a/ci/tests/Ref.bash b/ci/tests/Ref.bash old mode 100644 new mode 100755 From b308206ddf900a2aa6c2926c4e0dde907471c3a5 Mon Sep 17 00:00:00 2001 From: r9pena Date: Tue, 20 Jul 2021 18:57:53 -0600 Subject: [PATCH 084/112] Test #26 --- ci/tests/fputil.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 2957ffa28a..f267a25044 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -56,10 +56,10 @@ function integration_test { export SLEEP_TIME="10" export WORKDIR="${1}" export ROOTDIR="${WORKDIR}/build-artifacts" - # if [[ "${TEST_TYPE}" != "30-fputil" ]] - # then - # fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" - # fi + if [[ "${TEST_TYPE}" != "30-fputil" ]] + then + fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" + fi ( mkdir -p "${LOG_DIR}/gds-logs" # Start the GDS layer and give it time to run From 7ade858abb98e0a25f918e66d152b69f50efd947 Mon Sep 17 00:00:00 2001 From: r9pena Date: Wed, 21 Jul 2021 13:39:28 -0600 Subject: [PATCH 085/112] Test #27 --- ci/tests/fputil.bash | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index f267a25044..6104d1a8bc 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -56,10 +56,13 @@ function integration_test { export SLEEP_TIME="10" export WORKDIR="${1}" export ROOTDIR="${WORKDIR}/build-artifacts" - if [[ "${TEST_TYPE}" != "30-fputil" ]] - then - fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" - fi + + echo "${WORKDIR}" + echo "${ROOTDIR}" + # if [[ "${TEST_TYPE}" != "30-fputil" ]] + # then + # fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" + # fi ( mkdir -p "${LOG_DIR}/gds-logs" # Start the GDS layer and give it time to run From a31c10bd8e156375a2646eee828ad50703aabd01 Mon Sep 17 00:00:00 2001 From: r9pena Date: Wed, 21 Jul 2021 14:17:48 -0600 Subject: [PATCH 086/112] Test #28 --- ci/tests/fputil.bash | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 6104d1a8bc..d0a3ec5469 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -26,12 +26,12 @@ function fputil_action { PLATFORM="" # Generate is only needed when it isn't being tested - # if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]] - # then - # echo "[INFO] Generating build cache before ${DEPLOYMENT//\//_} '${TARGET}' execution" - # fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.out.log" 2> "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.err.log" \ - # || fail_and_stop "Failed to generate before ${DEPLOYMENT//\//_} '${TARGET}' execution" - # fi + if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]] + then + echo "[INFO] Generating build cache before ${DEPLOYMENT//\//_} '${TARGET}' execution" + fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.out.log" 2> "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.err.log" \ + || fail_and_stop "Failed to generate before ${DEPLOYMENT//\//_} '${TARGET}' execution" + fi cd "${WORKDIR}" if [[ "${TARGET}" != "generate" ]] && [[ "${TARGET}" != "generate --ut" ]] then @@ -59,10 +59,10 @@ function integration_test { echo "${WORKDIR}" echo "${ROOTDIR}" - # if [[ "${TEST_TYPE}" != "30-fputil" ]] - # then - # fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" - # fi + if [[ "${TEST_TYPE}" != "30-fputil" ]] + then + fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" + fi ( mkdir -p "${LOG_DIR}/gds-logs" # Start the GDS layer and give it time to run From 158ecab7d3c3acfbff8bd91977de97fe6bfc1d55 Mon Sep 17 00:00:00 2001 From: r9pena Date: Thu, 22 Jul 2021 16:48:21 -0600 Subject: [PATCH 087/112] Attached Integration test to Ref test --- .github/actions/Dockerfile | 2 -- ci/master.bash | 2 +- ci/tests/Ref.bash | 5 ++++- ci/tests/fputil.bash | 23 ++++++++++------------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile index 4d45133042..d85677fc20 100644 --- a/.github/actions/Dockerfile +++ b/.github/actions/Dockerfile @@ -10,5 +10,3 @@ USER fprime # Code file to execute when the docker container starts up (`entrypoint.sh`) ENTRYPOINT ["/entrypoint.sh"] - - diff --git a/ci/master.bash b/ci/master.bash index cec918ec25..2197eed522 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -42,7 +42,7 @@ export TEST_TYPE="${TEST}" #### NEEDED ENVIRONMENT #### export FPRIME_DIR="$(cd ${SCRIPT_DIR}/..; pwd)" -export LOG_DIR="${FPRIME_DIR}/ci-logs-$(date +"%Y-%m-%dT%H%M%S")" +export LOG_DIR="${FPRIME_DIR}/ci-${TEST}-logs-$(date +"%Y-%m-%dT%H%M%S")" mkdir -p "${LOG_DIR}" #### diff --git a/ci/tests/Ref.bash b/ci/tests/Ref.bash index fc96d06fd2..213d2419da 100755 --- a/ci/tests/Ref.bash +++ b/ci/tests/Ref.bash @@ -25,4 +25,7 @@ do fputil_action "${FPUTIL_DEPLOYS}" "${target}" END="$(date +%s)" echo "$[${END} - ${START}]" -done \ No newline at end of file +done + +echo -e "${BLUE}Testing ${INT_DEPLOYS} against integration tests${NOCOLOR}" +integration_test "${INT_DEPLOYS}" \ No newline at end of file diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index d0a3ec5469..9ac6387182 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -26,12 +26,12 @@ function fputil_action { PLATFORM="" # Generate is only needed when it isn't being tested - if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]] - then - echo "[INFO] Generating build cache before ${DEPLOYMENT//\//_} '${TARGET}' execution" - fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.out.log" 2> "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.err.log" \ - || fail_and_stop "Failed to generate before ${DEPLOYMENT//\//_} '${TARGET}' execution" - fi + # if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]] + # then + # echo "[INFO] Generating build cache before ${DEPLOYMENT//\//_} '${TARGET}' execution" + # fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.out.log" 2> "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.err.log" \ + # || fail_and_stop "Failed to generate before ${DEPLOYMENT//\//_} '${TARGET}' execution" + # fi cd "${WORKDIR}" if [[ "${TARGET}" != "generate" ]] && [[ "${TARGET}" != "generate --ut" ]] then @@ -57,12 +57,9 @@ function integration_test { export WORKDIR="${1}" export ROOTDIR="${WORKDIR}/build-artifacts" - echo "${WORKDIR}" - echo "${ROOTDIR}" - if [[ "${TEST_TYPE}" != "30-fputil" ]] - then - fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" - fi + # fprime-util generate + # fprime-util "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" + ( mkdir -p "${LOG_DIR}/gds-logs" # Start the GDS layer and give it time to run @@ -77,7 +74,7 @@ function integration_test { --leak-check=full \ --show-leak-kinds=all \ --track-origins=yes \ - --log-file=${LOG_DIR}/gds-logs/valgrind.log \ + # --log-file=${LOG_DIR}/gds-logs/valgrind.log \ ${ROOTDIR}/*/bin/Ref -a 127.0.0.1 -p 50000 1>${LOG_DIR}/gds-logs/Ref.stdout.log 2>${LOG_DIR}/gds-logs/Ref.stderr.log & VALGRIND_PID=$! From aa26e28e859e1dfcb9409eafe9e54d83297ff52f Mon Sep 17 00:00:00 2001 From: r9pena Date: Thu, 22 Jul 2021 16:59:35 -0600 Subject: [PATCH 088/112] Test #29 --- ci/tests/fputil.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 9ac6387182..c608960e8b 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -64,7 +64,7 @@ function integration_test { mkdir -p "${LOG_DIR}/gds-logs" # Start the GDS layer and give it time to run echo "[INFO] Starting headless GDS layer" - fprime-gds -n -r "${ROOTDIR}" -g none -l "${LOG_DIR}/gds-logs" 1>${LOG_DIR}/gds-logs/fprime-gds.stdout.log 2>${LOG_DIR}/gds-logs/fprime-gds.stderr.log & + fprime-gds -n -r "${ROOTDIR}" -g none -l "${LOG_DIR}/gds-logs" ## 1>${LOG_DIR}/gds-logs/fprime-gds.stdout.log 2>${LOG_DIR}/gds-logs/fprime-gds.stderr.log & GDS_PID=$! # run the app with valgrind in the background valgrind \ @@ -75,7 +75,7 @@ function integration_test { --show-leak-kinds=all \ --track-origins=yes \ # --log-file=${LOG_DIR}/gds-logs/valgrind.log \ - ${ROOTDIR}/*/bin/Ref -a 127.0.0.1 -p 50000 1>${LOG_DIR}/gds-logs/Ref.stdout.log 2>${LOG_DIR}/gds-logs/Ref.stderr.log & + ${ROOTDIR}/*/bin/Ref -a 127.0.0.1 -p 50000 & VALGRIND_PID=$! echo "[INFO] Allowing GDS ${SLEEP_TIME} seconds to start" From 90e2b47ddb42328289ead073eb1c43555906d291 Mon Sep 17 00:00:00 2001 From: r9pena Date: Thu, 22 Jul 2021 17:12:53 -0600 Subject: [PATCH 089/112] Test #30 --- ci/tests/fputil.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index c608960e8b..029b8dd9f2 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -64,7 +64,7 @@ function integration_test { mkdir -p "${LOG_DIR}/gds-logs" # Start the GDS layer and give it time to run echo "[INFO] Starting headless GDS layer" - fprime-gds -n -r "${ROOTDIR}" -g none -l "${LOG_DIR}/gds-logs" ## 1>${LOG_DIR}/gds-logs/fprime-gds.stdout.log 2>${LOG_DIR}/gds-logs/fprime-gds.stderr.log & + fprime-gds -n -r "${ROOTDIR}" -g none -l & GDS_PID=$! # run the app with valgrind in the background valgrind \ From b7edab7bb4c89a1e357f226dbb8e9b23f70bd7b6 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 09:57:41 -0600 Subject: [PATCH 090/112] Test #31 --- ci/tests/Ref.bash | 4 ++-- ci/tests/fputil.bash | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/tests/Ref.bash b/ci/tests/Ref.bash index 213d2419da..fd09999a89 100755 --- a/ci/tests/Ref.bash +++ b/ci/tests/Ref.bash @@ -27,5 +27,5 @@ do echo "$[${END} - ${START}]" done -echo -e "${BLUE}Testing ${INT_DEPLOYS} against integration tests${NOCOLOR}" -integration_test "${INT_DEPLOYS}" \ No newline at end of file +# echo -e "${BLUE}Testing ${INT_DEPLOYS} against integration tests${NOCOLOR}" +# integration_test "${INT_DEPLOYS}" \ No newline at end of file diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 029b8dd9f2..18011ebc1d 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -57,8 +57,9 @@ function integration_test { export WORKDIR="${1}" export ROOTDIR="${WORKDIR}/build-artifacts" - # fprime-util generate - # fprime-util "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" + cd "${WORKDIR}" + fprime-util "generate" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" + fprime-util "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" ( mkdir -p "${LOG_DIR}/gds-logs" From 2310583403973ca290e8be7b4eb191d75d318b27 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 10:09:05 -0600 Subject: [PATCH 091/112] Test #32 --- ci/tests/fputil.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 18011ebc1d..9b993b3091 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -58,8 +58,9 @@ function integration_test { export ROOTDIR="${WORKDIR}/build-artifacts" cd "${WORKDIR}" - fprime-util "generate" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" - fprime-util "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" + PLATFORM = "" + fprime-util "generate" "${PLATFORM}" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" + fprime-util "build" || fail_and_stop "Failed to build before integration test" ( mkdir -p "${LOG_DIR}/gds-logs" From 1418ec5ac409e884dd1d145979ff0d55a0cb4bcc Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 10:14:34 -0600 Subject: [PATCH 092/112] Test #33 --- ci/tests/fputil.bash | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 9b993b3091..d402228188 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -58,8 +58,7 @@ function integration_test { export ROOTDIR="${WORKDIR}/build-artifacts" cd "${WORKDIR}" - PLATFORM = "" - fprime-util "generate" "${PLATFORM}" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" + fprime-util "generate" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" fprime-util "build" || fail_and_stop "Failed to build before integration test" ( From b3e09c4a673358694af55dce7b3c7e52559340f9 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 10:36:43 -0600 Subject: [PATCH 093/112] Test #34 --- ci/tests/fputil.bash | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index d402228188..e9ce90f33b 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -24,6 +24,8 @@ function fputil_action { ( cd "${DEPLOYMENT}" PLATFORM="" + echo "${3}" + echo "${WORKDIR}" # Generate is only needed when it isn't being tested # if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]] @@ -35,11 +37,11 @@ function fputil_action { cd "${WORKDIR}" if [[ "${TARGET}" != "generate" ]] && [[ "${TARGET}" != "generate --ut" ]] then - echo "[INFO] FP Util in ${WORKDIR} running ${TARGET} with ${JOBS} jobs" + echo "[INFO] FP Util in ${WORKDIR} running ${TARGET} with ${JOBS} jobs" fprime-util ${TARGET} --jobs "${JOBS}" ${PLATFORM} > "${LOG_DIR}/${WORKDIR//\//_}_${TARGET/ /}.out.log" 2> "${LOG_DIR}/${WORKDIR//\//_}_${TARGET/ /}.err.log" \ || fail_and_stop "Failed to run '${TARGET}' in ${WORKDIR}" else - echo "[INFO] FP Util in ${WORKDIR} running ${TARGET}" + echo "[INFO] FP Util in ${WORKDIR} running ${TARGET}" fprime-util ${TARGET} ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${WORKDIR//\//_}_${TARGET/ /}.out.log" 2> "${LOG_DIR}/${WORKDIR//\//_}_${TARGET/ /}.err.log" \ || fail_and_stop "Failed to run '${TARGET}' in ${WORKDIR}" fi @@ -56,10 +58,11 @@ function integration_test { export SLEEP_TIME="10" export WORKDIR="${1}" export ROOTDIR="${WORKDIR}/build-artifacts" + let JOBS="${JOBS:-$(( ( RANDOM % 100 ) + 1 ))}" cd "${WORKDIR}" fprime-util "generate" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" - fprime-util "build" || fail_and_stop "Failed to build before integration test" + fprime-util "build" --jobs "${JOBS}" || fail_and_stop "Failed to build before integration test" ( mkdir -p "${LOG_DIR}/gds-logs" From 713760c229b0bb7521bc9bb97c78a7b168becae2 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 10:46:21 -0600 Subject: [PATCH 094/112] Test #35 --- ci/tests/fputil.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index e9ce90f33b..e914bd5042 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -62,6 +62,7 @@ function integration_test { cd "${WORKDIR}" fprime-util "generate" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" + cd "${ROOTDIR}" fprime-util "build" --jobs "${JOBS}" || fail_and_stop "Failed to build before integration test" ( From 6e0db346d0a0dd81f886e4760f17083b266cc061 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 11:02:35 -0600 Subject: [PATCH 095/112] Test #35 --- ci/tests/fputil.bash | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index e914bd5042..3efb5fe24e 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -4,6 +4,7 @@ # # Helpers to test via FP util #### +set -e export FPUTIL_TARGETS=("generate" "generate --ut" "build" "build --all" "check --all") # export FPUTIL_DEPLOYS="${FPRIME_DIR} ${FPRIME_DIR}/Ref ${FPRIME_DIR}/RPI" export FPUTIL_DEPLOYS="${FPRIME_DIR}/${TEST}" @@ -60,10 +61,13 @@ function integration_test { export ROOTDIR="${WORKDIR}/build-artifacts" let JOBS="${JOBS:-$(( ( RANDOM % 100 ) + 1 ))}" + CMAKE_EXTRA_SETTINGS="" + PLATFORM="" + cd "${WORKDIR}" - fprime-util "generate" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" - cd "${ROOTDIR}" - fprime-util "build" --jobs "${JOBS}" || fail_and_stop "Failed to build before integration test" + fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" + cd "${WORKDIR}/" + fprime-util "build" --jobs "${JOBS}" ${PLATFORM} || fail_and_stop "Failed to build before integration test" ( mkdir -p "${LOG_DIR}/gds-logs" From 47b5f8eba12a3d53cb4935b2b5a0ebbf2124bc42 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 11:16:12 -0600 Subject: [PATCH 096/112] Test #37 --- .github/workflows/build-test.yml | 126 +++++++++++++++---------------- ci/tests/fputil.bash | 4 +- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index db3dca745f..cb22310bff 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -13,74 +13,74 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - Framework: - # The type of runner that the job will run on - runs-on: ubuntu-latest + # Framework: + # # The type of runner that the job will run on + # runs-on: ubuntu-latest - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - # Runs the CI action internal to the repository - - name: F prime CI step - uses: ./.github/actions/ - id: github-ci-action - with: - test: Framework - # Archive the outputs - - name: 'Archive Logs' - uses: actions/upload-artifact@v2 - if: always() - with: - name: ci-logs - path: ci-logs.tar.gz - retention-days: 5 + # # Steps represent a sequence of tasks that will be executed as part of the job + # steps: + # # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + # - uses: actions/checkout@v2 + # # Runs the CI action internal to the repository + # - name: F prime CI step + # uses: ./.github/actions/ + # id: github-ci-action + # with: + # test: Framework + # # Archive the outputs + # - name: 'Archive Logs' + # uses: actions/upload-artifact@v2 + # if: always() + # with: + # name: ci-logs + # path: ci-logs.tar.gz + # retention-days: 5 - Ref: - # The type of runner that the job will run on - runs-on: ubuntu-latest + # Ref: + # # The type of runner that the job will run on + # runs-on: ubuntu-latest - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - # Runs the CI action internal to the repository - - name: F prime CI step - uses: ./.github/actions/ - id: github-ci-action - with: - test: 'Ref' - # Archive the outputs - - name: 'Archive Logs' - uses: actions/upload-artifact@v2 - if: always() - with: - name: ci-logs - path: ci-logs.tar.gz - retention-days: 5 + # # Steps represent a sequence of tasks that will be executed as part of the job + # steps: + # # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + # - uses: actions/checkout@v2 + # # Runs the CI action internal to the repository + # - name: F prime CI step + # uses: ./.github/actions/ + # id: github-ci-action + # with: + # test: 'Ref' + # # Archive the outputs + # - name: 'Archive Logs' + # uses: actions/upload-artifact@v2 + # if: always() + # with: + # name: ci-logs + # path: ci-logs.tar.gz + # retention-days: 5 - RPI: - # The type of runner that the job will run on - runs-on: ubuntu-latest + # RPI: + # # The type of runner that the job will run on + # runs-on: ubuntu-latest - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - # Runs the CI action internal to the repository - - name: F prime CI step - uses: ./.github/actions/ - id: github-ci-action - with: - test: 'RPI' - # Archive the outputs - - name: 'Archive Logs' - uses: actions/upload-artifact@v2 - if: always() - with: - name: ci-logs - path: ci-logs.tar.gz - retention-days: 5 + # # Steps represent a sequence of tasks that will be executed as part of the job + # steps: + # # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + # - uses: actions/checkout@v2 + # # Runs the CI action internal to the repository + # - name: F prime CI step + # uses: ./.github/actions/ + # id: github-ci-action + # with: + # test: 'RPI' + # # Archive the outputs + # - name: 'Archive Logs' + # uses: actions/upload-artifact@v2 + # if: always() + # with: + # name: ci-logs + # path: ci-logs.tar.gz + # retention-days: 5 Integration: # The type of runner that the job will run on diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 3efb5fe24e..570a39ea2b 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -66,8 +66,8 @@ function integration_test { cd "${WORKDIR}" fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" - cd "${WORKDIR}/" - fprime-util "build" --jobs "${JOBS}" ${PLATFORM} || fail_and_stop "Failed to build before integration test" + # cd "${WORKDIR}/" + # fprime-util "build" --jobs "${JOBS}" ${PLATFORM} || fail_and_stop "Failed to build before integration test" ( mkdir -p "${LOG_DIR}/gds-logs" From d233deb37e65de7a018cd7835057b4ca3f041697 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 11:21:20 -0600 Subject: [PATCH 097/112] Test #38 --- ci/tests/fputil.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 570a39ea2b..cf37da98af 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -66,8 +66,8 @@ function integration_test { cd "${WORKDIR}" fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" - # cd "${WORKDIR}/" - # fprime-util "build" --jobs "${JOBS}" ${PLATFORM} || fail_and_stop "Failed to build before integration test" + cd "${WORKDIR}/" + fprime-util "build" || fail_and_stop "Failed to build before integration test" ( mkdir -p "${LOG_DIR}/gds-logs" From 69341c17aac31735e25d3c13d711c52b26398943 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 11:32:23 -0600 Subject: [PATCH 098/112] Test #39 --- ci/tests/fputil.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index cf37da98af..9dbe74d089 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -65,9 +65,9 @@ function integration_test { PLATFORM="" cd "${WORKDIR}" - fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" + fprime-util "generate" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" cd "${WORKDIR}/" - fprime-util "build" || fail_and_stop "Failed to build before integration test" + # fprime-util "build" || fail_and_stop "Failed to build before integration test" ( mkdir -p "${LOG_DIR}/gds-logs" From 68fd4b4f15f03671cf0336df6fa17db89feadce6 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 12:29:28 -0600 Subject: [PATCH 099/112] Test #40 --- ci/tests/fputil.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 9dbe74d089..dbb3dbdbb4 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -73,7 +73,7 @@ function integration_test { mkdir -p "${LOG_DIR}/gds-logs" # Start the GDS layer and give it time to run echo "[INFO] Starting headless GDS layer" - fprime-gds -n -r "${ROOTDIR}" -g none -l & + fprime-gds -n -r "${ROOTDIR}" -g none -l "${LOG_DIR}/gds-logs" 1>${LOG_DIR}/gds-logs/fprime-gds.stdout.log 2>${LOG_DIR}/gds-logs/fprime-gds.stderr.log & GDS_PID=$! # run the app with valgrind in the background valgrind \ @@ -83,14 +83,14 @@ function integration_test { --leak-check=full \ --show-leak-kinds=all \ --track-origins=yes \ - # --log-file=${LOG_DIR}/gds-logs/valgrind.log \ - ${ROOTDIR}/*/bin/Ref -a 127.0.0.1 -p 50000 & + --log-file=${LOG_DIR}/gds-logs/valgrind.log \ + ${ROOTDIR}/*/bin/Ref -a 127.0.0.1 -p 50000 1>${LOG_DIR}/gds-logs/Ref.stdout.log 2>${LOG_DIR}/gds-logs/Ref.stderr.log & VALGRIND_PID=$! echo "[INFO] Allowing GDS ${SLEEP_TIME} seconds to start" sleep ${SLEEP_TIME} # Check the above started successfully - ps -p ${GDS_PID} 2> /dev/null 1> /dev/null || fail_and_stop "Failed to run GDS layer headlessly" + ps -p ${GDS_PID} || fail_and_stop "Failed to run GDS layer headlessly" ps -p ${VALGRIND_PID} 2> /dev/null 1> /dev/null || fail_and_stop "Failed to start Ref with Valgrind" # Run integration tests ( From b4dda9736e964d737ce4fe04a9829ab352006b24 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 12:32:44 -0600 Subject: [PATCH 100/112] Test #41 --- ci/tests/fputil.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index dbb3dbdbb4..bfe5f6a020 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -67,7 +67,7 @@ function integration_test { cd "${WORKDIR}" fprime-util "generate" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" cd "${WORKDIR}/" - # fprime-util "build" || fail_and_stop "Failed to build before integration test" + fprime-util "build" || fail_and_stop "Failed to build before integration test" ( mkdir -p "${LOG_DIR}/gds-logs" From 54699ce7fc8f8006ada36e1573b4adfa9d7c2942 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 12:47:41 -0600 Subject: [PATCH 101/112] Test #42 --- ci/tests/fputil.bash | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index bfe5f6a020..f92c9dff1f 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -25,8 +25,6 @@ function fputil_action { ( cd "${DEPLOYMENT}" PLATFORM="" - echo "${3}" - echo "${WORKDIR}" # Generate is only needed when it isn't being tested # if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]] @@ -67,7 +65,7 @@ function integration_test { cd "${WORKDIR}" fprime-util "generate" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" cd "${WORKDIR}/" - fprime-util "build" || fail_and_stop "Failed to build before integration test" + fprime-util "build" --jobs "${JOBS}" ${PLATFORM} || fail_and_stop "Failed to build before integration test" ( mkdir -p "${LOG_DIR}/gds-logs" From d35cc3e49b9154d44c5777ef4f944402a37d8ed2 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 13:57:08 -0600 Subject: [PATCH 102/112] Test #43 --- ci/tests/fputil.bash | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index f92c9dff1f..1ff9f87ee6 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -63,9 +63,11 @@ function integration_test { PLATFORM="" cd "${WORKDIR}" - fprime-util "generate" || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" + fprime-util "generate" > "${LOG_DIR}/${WORKDIR//\//_}_pregen.out.log" 2> "${LOG_DIR}/${WORKDIR//\//_}_pregen.err.log" \ + || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" cd "${WORKDIR}/" - fprime-util "build" --jobs "${JOBS}" ${PLATFORM} || fail_and_stop "Failed to build before integration test" + fprime-util "build" --jobs "${JOBS}" ${PLATFORM} > "${LOG_DIR}/${WORKDIR//\//_}_${TARGET/ /}.out.log" 2> "${LOG_DIR}/${WORKDIR//\//_}_${TARGET/ /}.err.log" \ + || fail_and_stop "Failed to build before integration test" ( mkdir -p "${LOG_DIR}/gds-logs" From a2b0a526affe29c716d8d0701fcc142972151eb5 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 13:57:56 -0600 Subject: [PATCH 103/112] Test #43 --- .github/workflows/build-test.yml | 128 +++++++++++++++---------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index cb22310bff..89e4cf05e9 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -12,75 +12,75 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" - # Framework: - # # The type of runner that the job will run on - # runs-on: ubuntu-latest + This workflow contains a single job called "build" + Framework: + # The type of runner that the job will run on + runs-on: ubuntu-latest - # # Steps represent a sequence of tasks that will be executed as part of the job - # steps: - # # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - # - uses: actions/checkout@v2 - # # Runs the CI action internal to the repository - # - name: F prime CI step - # uses: ./.github/actions/ - # id: github-ci-action - # with: - # test: Framework - # # Archive the outputs - # - name: 'Archive Logs' - # uses: actions/upload-artifact@v2 - # if: always() - # with: - # name: ci-logs - # path: ci-logs.tar.gz - # retention-days: 5 + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + # Runs the CI action internal to the repository + - name: F prime CI step + uses: ./.github/actions/ + id: github-ci-action + with: + test: Framework + # Archive the outputs + - name: 'Archive Logs' + uses: actions/upload-artifact@v2 + if: always() + with: + name: ci-logs + path: ci-logs.tar.gz + retention-days: 5 - # Ref: - # # The type of runner that the job will run on - # runs-on: ubuntu-latest + Ref: + # The type of runner that the job will run on + runs-on: ubuntu-latest - # # Steps represent a sequence of tasks that will be executed as part of the job - # steps: - # # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - # - uses: actions/checkout@v2 - # # Runs the CI action internal to the repository - # - name: F prime CI step - # uses: ./.github/actions/ - # id: github-ci-action - # with: - # test: 'Ref' - # # Archive the outputs - # - name: 'Archive Logs' - # uses: actions/upload-artifact@v2 - # if: always() - # with: - # name: ci-logs - # path: ci-logs.tar.gz - # retention-days: 5 + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + # Runs the CI action internal to the repository + - name: F prime CI step + uses: ./.github/actions/ + id: github-ci-action + with: + test: 'Ref' + # Archive the outputs + - name: 'Archive Logs' + uses: actions/upload-artifact@v2 + if: always() + with: + name: ci-logs + path: ci-logs.tar.gz + retention-days: 5 - # RPI: - # # The type of runner that the job will run on - # runs-on: ubuntu-latest + RPI: + # The type of runner that the job will run on + runs-on: ubuntu-latest - # # Steps represent a sequence of tasks that will be executed as part of the job - # steps: - # # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - # - uses: actions/checkout@v2 - # # Runs the CI action internal to the repository - # - name: F prime CI step - # uses: ./.github/actions/ - # id: github-ci-action - # with: - # test: 'RPI' - # # Archive the outputs - # - name: 'Archive Logs' - # uses: actions/upload-artifact@v2 - # if: always() - # with: - # name: ci-logs - # path: ci-logs.tar.gz - # retention-days: 5 + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + # Runs the CI action internal to the repository + - name: F prime CI step + uses: ./.github/actions/ + id: github-ci-action + with: + test: 'RPI' + # Archive the outputs + - name: 'Archive Logs' + uses: actions/upload-artifact@v2 + if: always() + with: + name: ci-logs + path: ci-logs.tar.gz + retention-days: 5 Integration: # The type of runner that the job will run on From f4b2ced4d14e4002e2155efb95230c88558cfae7 Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 13:59:22 -0600 Subject: [PATCH 104/112] Test #44 --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 89e4cf05e9..db3dca745f 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -12,7 +12,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - This workflow contains a single job called "build" + # This workflow contains a single job called "build" Framework: # The type of runner that the job will run on runs-on: ubuntu-latest From 5f90df07b4d1059bf24efa9688c08d34a1dd581e Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 14:10:56 -0600 Subject: [PATCH 105/112] Test #45 --- ci/tests/fputil.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 1ff9f87ee6..035f3e3bc5 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -63,10 +63,10 @@ function integration_test { PLATFORM="" cd "${WORKDIR}" - fprime-util "generate" > "${LOG_DIR}/${WORKDIR//\//_}_pregen.out.log" 2> "${LOG_DIR}/${WORKDIR//\//_}_pregen.err.log" \ + fprime-util "generate" > "${LOG_DIR}/${WORKDIR//\//_}_pregen.out.log" 2> "${LOG_DIR}/${WORKDIR//\//_}_pregen.err.log" \ || fail_and_stop "Failed to generate before ${WORKDIR//\//_} building integration test" cd "${WORKDIR}/" - fprime-util "build" --jobs "${JOBS}" ${PLATFORM} > "${LOG_DIR}/${WORKDIR//\//_}_${TARGET/ /}.out.log" 2> "${LOG_DIR}/${WORKDIR//\//_}_${TARGET/ /}.err.log" \ + fprime-util "build" --jobs "${JOBS}" ${PLATFORM} > "${LOG_DIR}/${WORKDIR//\//_}_${TARGET/ /}.out.log" 2> "${LOG_DIR}/${WORKDIR//\//_}_${TARGET/ /}.err.log" \ || fail_and_stop "Failed to build before integration test" ( From 8f017597d4255a4b5926d205adbeeb2ea97ed0cf Mon Sep 17 00:00:00 2001 From: r9pena Date: Fri, 23 Jul 2021 16:10:32 -0600 Subject: [PATCH 106/112] Cleaned up files to remove commented code --- .github/workflows/build-test.yml | 10 ++++---- ci/master.bash | 41 -------------------------------- ci/tests/30-ints.bash | 10 ++++---- ci/tests/Framework.bash | 3 --- ci/tests/RPI.bash | 3 --- ci/tests/Ref.bash | 6 ----- ci/tests/fputil.bash | 8 ------- 7 files changed, 9 insertions(+), 72 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index db3dca745f..c3a100bc2f 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -12,7 +12,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" + # This workflow contains 4 jobs. One for every CI test." Framework: # The type of runner that the job will run on runs-on: ubuntu-latest @@ -32,7 +32,7 @@ jobs: uses: actions/upload-artifact@v2 if: always() with: - name: ci-logs + name: ci-framework-logs path: ci-logs.tar.gz retention-days: 5 @@ -55,7 +55,7 @@ jobs: uses: actions/upload-artifact@v2 if: always() with: - name: ci-logs + name: ci-ref-logs path: ci-logs.tar.gz retention-days: 5 @@ -78,7 +78,7 @@ jobs: uses: actions/upload-artifact@v2 if: always() with: - name: ci-logs + name: ci-rpi-logs path: ci-logs.tar.gz retention-days: 5 @@ -101,6 +101,6 @@ jobs: uses: actions/upload-artifact@v2 if: always() with: - name: ci-logs + name: ci-int-logs path: ci-logs.tar.gz retention-days: 5 \ No newline at end of file diff --git a/ci/master.bash b/ci/master.bash index 2197eed522..6aa066a92b 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -13,55 +13,14 @@ export TEST="${@}" TEST_RUN="${SCRIPT_DIR}/tests/${TEST}.bash" export TEST_TYPE="${TEST}" -# if [[ "${TEST}" == "" ]] || [[ "${TEST}" == "Ref" ]] || [[ "${TEST}" == "RPI" ]] -# then -# TEST_RUN="${SCRIPT_DIR}/tests/20-fputil.bash" -# export TEST_TYPE="20-fputil" -# elif [[ "${TEST}" == "30-ints" ]] -# then -# TEST_RUN="${SCRIPT_DIR}/tests/30-ints.bash" -# export TEST_TYPE="30-ints" -# else -# echo "===================NOTHING WAS DONE++++++++++++++++++++++++++++++" -# fi - -# TESTS="${@}" -# export TEST_TYPE="FULL" -# if (( $# == 0 )) || [[ "${TESTS}" == "FULL" ]] -# then -# TESTS="$(ls "${SCRIPT_DIR}/tests"/*)" -# elif [[ "${TESTS}" == "QUICK" ]] -# then -# TESTS="${SCRIPT_DIR}/tests/20-fputil.bash ${SCRIPT_DIR}/tests/30-ints.bash" -# export TEST_TYPE="QUICK" -# elif [[ "${TESTS}" == "STATIC" ]] -# then -# TESTS="${SCRIPT_DIR}/tests/40-pylama.bash" -# export TEST_TYPE="STATIC" -# fi - #### NEEDED ENVIRONMENT #### export FPRIME_DIR="$(cd ${SCRIPT_DIR}/..; pwd)" export LOG_DIR="${FPRIME_DIR}/ci-${TEST}-logs-$(date +"%Y-%m-%dT%H%M%S")" mkdir -p "${LOG_DIR}" -#### -# RP - Remove after refactor. Tools should be installed in Docker image. -#### -# . "${SCRIPT_DIR}/bootstrap.bash" - # Run the test script echo -e "${BLUE}Starting CI test ${TEST_RUN} ${TEST}${NOCOLOR}" /usr/bin/time "${TEST_RUN}" || fail_and_stop "${TEST} failed" echo -e "${GREEN}CI test ${TEST_RUN} ${TEST} SUCCESSFUL${NOCOLOR}" - -# Loop through all scripts in tests directory and run them -# for test_script in ${TESTS} -# do -# # "${SCRIPT_DIR}/clean.bash" || fail_and_stop "Cleaning directory" -# echo -e "${BLUE}Starting CI test ${test_script}${NOCOLOR}" -# /usr/bin/time "${test_script}" || fail_and_stop "${test_script} failed" -# echo -e "${GREEN}CI test ${test_script} SUCCESSFUL${NOCOLOR}" -# done archive_logs diff --git a/ci/tests/30-ints.bash b/ci/tests/30-ints.bash index 6bcf4b50c9..9ce1660378 100755 --- a/ci/tests/30-ints.bash +++ b/ci/tests/30-ints.bash @@ -8,9 +8,7 @@ export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" . ${SCRIPT_DIR}/tests/fputil.bash -# Loop over deployments and targets -for deployment in ${INT_DEPLOYS} -do - echo -e "${BLUE}Testing ${deployment} against integration tests${NOCOLOR}" - integration_test "${deployment}" -done + +# Run integration tests +echo -e "${BLUE}Testing ${INT_DEPLOYS} against integration tests${NOCOLOR}" +integration_test "${INT_DEPLOYS}" diff --git a/ci/tests/Framework.bash b/ci/tests/Framework.bash index 53fd4b7ebf..98f4561ae3 100755 --- a/ci/tests/Framework.bash +++ b/ci/tests/Framework.bash @@ -14,12 +14,9 @@ echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_ export CHECK_TARGET_PLATFORM="native" for target in "${FPUTIL_TARGETS[@]}" do - START="$(date +%s)" if [[ "${target}" == "generate" ]] then rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* fi fputil_action "${FPUTIL_DEPLOYS}" "${target}" - END="$(date +%s)" - echo "$[${END} - ${START}]" done \ No newline at end of file diff --git a/ci/tests/RPI.bash b/ci/tests/RPI.bash index a77c7da6dd..73355a66f8 100755 --- a/ci/tests/RPI.bash +++ b/ci/tests/RPI.bash @@ -22,12 +22,9 @@ echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_ export CHECK_TARGET_PLATFORM="native" for target in "${FPUTIL_TARGETS[@]}" do - START="$(date +%s)" if [[ "${target}" == "generate" ]] then rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* fi fputil_action "${FPUTIL_DEPLOYS}" "${target}" - END="$(date +%s)" - echo "$[${END} - ${START}]" done \ No newline at end of file diff --git a/ci/tests/Ref.bash b/ci/tests/Ref.bash index fd09999a89..de557a22d3 100755 --- a/ci/tests/Ref.bash +++ b/ci/tests/Ref.bash @@ -17,15 +17,9 @@ echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_ export CHECK_TARGET_PLATFORM="native" for target in "${FPUTIL_TARGETS[@]}" do - START="$(date +%s)" if [[ "${target}" == "generate" ]] then rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* fi fputil_action "${FPUTIL_DEPLOYS}" "${target}" - END="$(date +%s)" - echo "$[${END} - ${START}]" done - -# echo -e "${BLUE}Testing ${INT_DEPLOYS} against integration tests${NOCOLOR}" -# integration_test "${INT_DEPLOYS}" \ No newline at end of file diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 035f3e3bc5..39f88f465a 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -23,16 +23,8 @@ function fputil_action { export WORKDIR="${DEPLOYMENT}/${3}" let JOBS="${JOBS:-$(( ( RANDOM % 100 ) + 1 ))}" ( - cd "${DEPLOYMENT}" PLATFORM="" - # Generate is only needed when it isn't being tested - # if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]] - # then - # echo "[INFO] Generating build cache before ${DEPLOYMENT//\//_} '${TARGET}' execution" - # fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.out.log" 2> "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.err.log" \ - # || fail_and_stop "Failed to generate before ${DEPLOYMENT//\//_} '${TARGET}' execution" - # fi cd "${WORKDIR}" if [[ "${TARGET}" != "generate" ]] && [[ "${TARGET}" != "generate --ut" ]] then From fa70aba18d50cec6c7856bf6ff9fe1970ea03b51 Mon Sep 17 00:00:00 2001 From: r9pena Date: Mon, 26 Jul 2021 08:28:33 -0600 Subject: [PATCH 107/112] Remove CI test branch from workflow --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index c3a100bc2f..b824e1d6b5 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -6,7 +6,7 @@ name: CI # events but only for the master branch on: push: - branches: [ master, devel, CI-test ] + branches: [ master, devel ] pull_request: branches: [ master, devel, release/v3.0.0 ] From 6c0a66383f7e57bc5d11be32074aab6db7f0101d Mon Sep 17 00:00:00 2001 From: r9pena Date: Mon, 26 Jul 2021 10:48:48 -0600 Subject: [PATCH 108/112] Incorporated comments for PR --- .github/actions/entrypoint.sh | 2 +- ci/tests/Framework.bash | 2 +- ci/tests/fputil.bash | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh index 6c92bf62c7..d9986c81b7 100755 --- a/.github/actions/entrypoint.sh +++ b/.github/actions/entrypoint.sh @@ -4,7 +4,7 @@ set -e set -x cd "$GITHUB_WORKSPACE" -if "$GITHUB_WORKFLOW" == "Autodocs" +if [ "$GITHUB_WORKFLOW" == "Autodocs" ] then /autodoc.bash else diff --git a/ci/tests/Framework.bash b/ci/tests/Framework.bash index 98f4561ae3..8bdad28004 100755 --- a/ci/tests/Framework.bash +++ b/ci/tests/Framework.bash @@ -18,5 +18,5 @@ do then rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* fi - fputil_action "${FPUTIL_DEPLOYS}" "${target}" + fputil_action "${FPRIME_DIR}" "${target}" done \ No newline at end of file diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 39f88f465a..7cc10fbd31 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -18,9 +18,8 @@ export INT_DEPLOYS="${FPRIME_DIR}/Ref" # :param deploy($2): deployment to run on #### function fputil_action { - export DEPLOYMENT="${1}" + export WORKDIR="${1}" export TARGET="${2}" - export WORKDIR="${DEPLOYMENT}/${3}" let JOBS="${JOBS:-$(( ( RANDOM % 100 ) + 1 ))}" ( PLATFORM="" From 28a82fb791c38b441754e17edc928968266fec3e Mon Sep 17 00:00:00 2001 From: r9pena Date: Mon, 26 Jul 2021 11:10:01 -0600 Subject: [PATCH 109/112] Modified path for framework job test --- ci/tests/Framework.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tests/Framework.bash b/ci/tests/Framework.bash index 8bdad28004..22c966c66b 100755 --- a/ci/tests/Framework.bash +++ b/ci/tests/Framework.bash @@ -10,13 +10,13 @@ export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . ${SCRIPT_DIR}/tests/fputil.bash export CMAKE_EXTRA_SETTINGS="" -echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" +echo -e "${BLUE}Testing ${FPRIME_DIR} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" export CHECK_TARGET_PLATFORM="native" for target in "${FPUTIL_TARGETS[@]}" do if [[ "${target}" == "generate" ]] then - rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* + rm -rf "${FRIME_DIR}/build-fprime-automatic-"* fi fputil_action "${FPRIME_DIR}" "${target}" done \ No newline at end of file From 6b2fd3a44be297da12e092af726d993c847c8951 Mon Sep 17 00:00:00 2001 From: r9pena Date: Mon, 26 Jul 2021 11:31:03 -0600 Subject: [PATCH 110/112] Incoporate reviewer comment for PR --- ci/tests/fputil.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 7cc10fbd31..89f8acb989 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -81,7 +81,7 @@ function integration_test { echo "[INFO] Allowing GDS ${SLEEP_TIME} seconds to start" sleep ${SLEEP_TIME} # Check the above started successfully - ps -p ${GDS_PID} || fail_and_stop "Failed to run GDS layer headlessly" + ps -p ${GDS_PID} 2> /dev/null 1> /dev/null || fail_and_stop "Failed to run GDS layer headlessly" ps -p ${VALGRIND_PID} 2> /dev/null 1> /dev/null || fail_and_stop "Failed to start Ref with Valgrind" # Run integration tests ( From 55ac01e661df75c9d3aa3d510a3a03e27fae161a Mon Sep 17 00:00:00 2001 From: r9pena Date: Mon, 26 Jul 2021 12:32:53 -0600 Subject: [PATCH 111/112] Incoporated reviewer comment for PR --- ci/tests/20-fputil.bash | 70 ----------------------------------------- ci/tests/30-ints.bash | 3 ++ ci/tests/Framework.bash | 10 +++--- ci/tests/RPI.bash | 4 ++- ci/tests/Ref.bash | 4 ++- ci/tests/fputil.bash | 3 -- 6 files changed, 15 insertions(+), 79 deletions(-) delete mode 100755 ci/tests/20-fputil.bash diff --git a/ci/tests/20-fputil.bash b/ci/tests/20-fputil.bash deleted file mode 100755 index ab8551e70c..0000000000 --- a/ci/tests/20-fputil.bash +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -#### -# 20-fputil.bash: -# -# Run the tests on the software through fp-util. -#### -export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." -. "${SCRIPT_DIR}/helpers.bash" - -. ${SCRIPT_DIR}/tests/fputil.bash - -export CMAKE_EXTRA_SETTINGS="" -if [[ "${FPUTIL_DEPLOYS}" == */RPI ]] && [ ! -d "/opt/rpi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf" ] -then - warn_and_cont "RPI tools not installed, refusing to test." - continue -fi -# Check if RPI or Ref deployment to disable FRAMEWORK UTS -# RP - These are the only 2 deployments used by the 20-fputil CI -if [[ "${FPUTIL_DEPLOYS}" == */RPI ]] || [[ "${FPUTIL_DEPLOYS}" == */Ref ]] -then - export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" -fi -echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" -export CHECK_TARGET_PLATFORM="native" -for target in "${FPUTIL_TARGETS[@]}" -do - START="$(date +%s)" - # RP - This if stmt is only used for the 20-fputil CI - if [[ "${target}" == "generate" ]] - then - rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* - fi - fputil_action "${FPUTIL_DEPLOYS}" "${target}" - END="$(date +%s)" - echo "$[${END} - ${START}]" -done - -# Loop over deployments and targets -# for deployment in ${FPUTIL_DEPLOYS} -# do -# export CMAKE_EXTRA_SETTINGS="" -# if [[ "${deployment}" == */RPI ]] && [ ! -d "/opt/rpi/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf" ] -# then -# warn_and_cont "RPI tools not installed, refusing to test." -# continue -# fi -# # Check if RPI or Ref deployment to disable FRAMEWORK UTS -# # RP - These are the only 2 deployments used by the 20-fputil CI -# if [[ "${deployment}" == */RPI ]] || [[ "${deployment}" == */Ref ]] -# then -# export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" -# fi -# echo -e "${BLUE}Testing ${deployment} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" -# export CHECK_TARGET_PLATFORM="native" -# for target in "${FPUTIL_TARGETS[@]}" -# do -# # RP - This if stmt is only used for the 20-fputil CI -# if [[ "${TEST_TYPE}" != "20-fputil" ]] || [[ "${target}" == "generate" ]] -# then -# rm -rf "${deployment}/build-fprime-automatic-"* -# fi -# fputil_action "${deployment}" "${target}" -# # RP - This if stmt is only used for the 20-fputil CI -# if [[ "${TEST_TYPE}" != "20-fputil" ]] -# then -# "${SCRIPT_DIR}/clean.bash" || fail_and_stop "Cleaning repository" -# fi -# done -# done diff --git a/ci/tests/30-ints.bash b/ci/tests/30-ints.bash index 9ce1660378..ade1e32eee 100755 --- a/ci/tests/30-ints.bash +++ b/ci/tests/30-ints.bash @@ -4,6 +4,9 @@ # # Integration tests for CI #### +# Directory to be used for Integration CI test +export FPUTIL_DEPLOYS="${FPRIME_DIR}/Ref" + export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" diff --git a/ci/tests/Framework.bash b/ci/tests/Framework.bash index 22c966c66b..ae5d931d65 100755 --- a/ci/tests/Framework.bash +++ b/ci/tests/Framework.bash @@ -4,19 +4,21 @@ # # Run the tests on the software through fp-util. #### +# Directory to be used for Framework CI test +export FPUTIL_DEPLOYS="${FPRIME_DIR}" + export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" - . ${SCRIPT_DIR}/tests/fputil.bash export CMAKE_EXTRA_SETTINGS="" -echo -e "${BLUE}Testing ${FPRIME_DIR} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" +echo -e "${BLUE}Testing ${FPUTIL_DEPLOYS} against fprime-util targets: ${FPUTIL_TARGETS[@]}${NOCOLOR}" export CHECK_TARGET_PLATFORM="native" for target in "${FPUTIL_TARGETS[@]}" do if [[ "${target}" == "generate" ]] then - rm -rf "${FRIME_DIR}/build-fprime-automatic-"* + rm -rf "${FPUTIL_DEPLOYS}/build-fprime-automatic-"* fi - fputil_action "${FPRIME_DIR}" "${target}" + fputil_action "${FPUTIL_DEPLOYS}" "${target}" done \ No newline at end of file diff --git a/ci/tests/RPI.bash b/ci/tests/RPI.bash index 73355a66f8..cdccb4fb1c 100755 --- a/ci/tests/RPI.bash +++ b/ci/tests/RPI.bash @@ -4,9 +4,11 @@ # # Run the tests on the software through fp-util. #### +# Directory to be used for RPI CI test +export FPUTIL_DEPLOYS="${FPRIME_DIR}/RPI" + export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" - . ${SCRIPT_DIR}/tests/fputil.bash export CMAKE_EXTRA_SETTINGS="" diff --git a/ci/tests/Ref.bash b/ci/tests/Ref.bash index de557a22d3..f5551015ed 100755 --- a/ci/tests/Ref.bash +++ b/ci/tests/Ref.bash @@ -4,9 +4,11 @@ # # Run the tests on the software through fp-util. #### +# Directory to be used for Ref CI test +export FPUTIL_DEPLOYS="${FPRIME_DIR}/Ref" + export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." . "${SCRIPT_DIR}/helpers.bash" - . ${SCRIPT_DIR}/tests/fputil.bash export CMAKE_EXTRA_SETTINGS="" diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 89f8acb989..5402a8cd66 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -6,9 +6,6 @@ #### set -e export FPUTIL_TARGETS=("generate" "generate --ut" "build" "build --all" "check --all") -# export FPUTIL_DEPLOYS="${FPRIME_DIR} ${FPRIME_DIR}/Ref ${FPRIME_DIR}/RPI" -export FPUTIL_DEPLOYS="${FPRIME_DIR}/${TEST}" -export INT_DEPLOYS="${FPRIME_DIR}/Ref" #### # fputil_action: # From 01c0013afcb939c665adb403c0e4d9c213404e19 Mon Sep 17 00:00:00 2001 From: r9pena Date: Mon, 26 Jul 2021 12:38:23 -0600 Subject: [PATCH 112/112] Was using incorrect directory for the test --- ci/tests/30-ints.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tests/30-ints.bash b/ci/tests/30-ints.bash index ade1e32eee..f64cb085fb 100755 --- a/ci/tests/30-ints.bash +++ b/ci/tests/30-ints.bash @@ -14,4 +14,4 @@ export SCRIPT_DIR="$(dirname ${BASH_SOURCE})/.." # Run integration tests echo -e "${BLUE}Testing ${INT_DEPLOYS} against integration tests${NOCOLOR}" -integration_test "${INT_DEPLOYS}" +integration_test "${FPUTIL_DEPLOYS}"