From 1cd7baa3671692b4a34b0ea10b9df21bb8b3b169 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 18:14:28 +0200 Subject: [PATCH 01/19] prep book release --- satrs-book/src/SUMMARY.md | 9 --------- satrs-book/src/TODO.md | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 satrs-book/src/TODO.md diff --git a/satrs-book/src/SUMMARY.md b/satrs-book/src/SUMMARY.md index 995e8a9..0dfb982 100644 --- a/satrs-book/src/SUMMARY.md +++ b/satrs-book/src/SUMMARY.md @@ -8,12 +8,3 @@ - [Modes and Health](./modes-and-health.md) - [Housekeeping Data](./housekeeping.md) - [Events](./events.md) -- [Power Components](./power.md) -- [Thermal Components](./thermal.md) -- [Persistent TM storage](./persistent-tm-storage.md) -- [FDIR](./fdir.md) -- [Serialization of Data](./serialization.md) -- [Logging](./logging.md) -- [Modelling space systems](./modelling-space-systems.md) -- [Ground Segments](./ground-segments.md) - diff --git a/satrs-book/src/TODO.md b/satrs-book/src/TODO.md new file mode 100644 index 0000000..91f660f --- /dev/null +++ b/satrs-book/src/TODO.md @@ -0,0 +1,9 @@ +- [Power Components](./power.md) +- [Thermal Components](./thermal.md) +- [Persistent TM storage](./persistent-tm-storage.md) +- [FDIR](./fdir.md) +- [Serialization of Data](./serialization.md) +- [Logging](./logging.md) +- [Modelling space systems](./modelling-space-systems.md) +- [Ground Segments](./ground-segments.md) + From eb6a94980a09cff740b91f8f0db7c8ca4ac6c0d5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 18:24:37 +0200 Subject: [PATCH 02/19] this should allow automatic book deployment --- automation/Dockerfile | 9 ++++ automation/Jenkinsfile | 118 ++++++++++++++++++++++------------------- 2 files changed, 73 insertions(+), 54 deletions(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index 09132c5..f8912d4 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -4,6 +4,7 @@ FROM rust:latest RUN apt-get update RUN apt-get --yes upgrade +RUN apt-get --yes install openssh-client # tzdata is a dependency, won't install otherwise ARG DEBIAN_FRONTEND=noninteractive @@ -13,3 +14,11 @@ ENV CROSS_CONTAINER_IN_CONTAINER=true RUN rustup install nightly && \ rustup target add thumbv7em-none-eabihf armv7-unknown-linux-gnueabihf && \ rustup component add rustfmt clippy +RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked + +# SSH stuff to allow deployment to doc server +RUN adduser --uid 114 jenkins + +# Add documentation server to known hosts +RUN echo "|1|/LzCV4BuTmTb2wKnD146l9fTKgQ=|NJJtVjvWbtRt8OYqFgcYRnMQyVw= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts +RUN echo "|1|CcBvBc3EG03G+XM5rqRHs6gK/Gg=|oGeJQ+1I8NGI2THIkJsW92DpTzs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 0770614..d7623f4 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -1,59 +1,69 @@ pipeline { - - agent { - dockerfile { - dir 'automation' - reuseNode true - } + agent { + dockerfile { + dir 'automation' + reuseNode true } + } - stages { - stage('Rust Toolchain Info') { - steps { - sh 'rustc --version' - } - } - stage('Clippy') { - steps { - sh 'cargo clippy' - } - } - stage('Docs') { - steps { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh 'cargo +nightly doc --all-features' - } - } - } - stage('Rustfmt') { - steps { - sh 'cargo fmt --all --check' - } - } - stage('Test') { - steps { - sh 'cargo test --all-features' - } - } - stage('Check with all features') { - steps { - sh 'cargo check --all-features' - } - } - stage('Check with no features') { - steps { - sh 'cargo check --no-default-features' - } - } - stage('Check Cross Embedded Bare Metal') { - steps { - sh 'cargo check -p satrs-core --target thumbv7em-none-eabihf --no-default-features' - } - } - stage('Check Cross Embedded Linux') { - steps { - sh 'cargo check --target armv7-unknown-linux-gnueabihf' - } - } + stages { + stage('Rust Toolchain Info') { + steps { + sh 'rustc --version' + } } + stage('Clippy') { + steps { + sh 'cargo clippy' + } + } + stage('Docs') { + steps { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh 'cargo +nightly doc --all-features' + } + } + } + stage('Rustfmt') { + steps { + sh 'cargo fmt --all --check' + } + } + stage('Test') { + steps { + sh 'cargo test --all-features' + } + } + stage('Check with all features') { + steps { + sh 'cargo check --all-features' + } + } + stage('Check with no features') { + steps { + sh 'cargo check --no-default-features' + } + } + stage('Check Cross Embedded Bare Metal') { + steps { + sh 'cargo check -p satrs-core --target thumbv7em-none-eabihf --no-default-features' + } + } + stage('Check Cross Embedded Linux') { + steps { + sh 'cargo check --target armv7-unknown-linux-gnueabihf' + } + } + stage('Deploy satrs-book') { + steps { + dir('satrs-book') { + mdbook build + sshagent(credentials: ['documentation-buildfix']) { + // Deploy to Apache webserver + sh 'rsync -r --delete book/ buildfix@documentation.irs.uni-stuttgart.de:/projects/sat-rs' + } + } + } + } + } } From 6579c6d86440c6fc75fe04fc6e64d024629e9369 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 18:26:33 +0200 Subject: [PATCH 03/19] some improvements --- automation/Dockerfile | 2 +- automation/Jenkinsfile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index f8912d4..c8c71e3 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -4,7 +4,7 @@ FROM rust:latest RUN apt-get update RUN apt-get --yes upgrade -RUN apt-get --yes install openssh-client +RUN apt-get --yes install rsync openssh-client # tzdata is a dependency, won't install otherwise ARG DEBIAN_FRONTEND=noninteractive diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index d7623f4..eca0426 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -55,6 +55,9 @@ pipeline { } } stage('Deploy satrs-book') { + when { + branch 'main' + } steps { dir('satrs-book') { mdbook build From 4fedcc47c29ea2952656a4219996c8903675cd3e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 18:27:54 +0200 Subject: [PATCH 04/19] need this argument as well --- automation/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index eca0426..12beda8 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -3,6 +3,7 @@ pipeline { dockerfile { dir 'automation' reuseNode true + args '--network host' } } From fb86e6dfc0b16faa483c961b70e7495836fea1f5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 18:35:20 +0200 Subject: [PATCH 05/19] this should work.. --- automation/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index c8c71e3..d97bc07 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -4,9 +4,9 @@ FROM rust:latest RUN apt-get update RUN apt-get --yes upgrade -RUN apt-get --yes install rsync openssh-client # tzdata is a dependency, won't install otherwise ARG DEBIAN_FRONTEND=noninteractive +RUN apt-get --yes install rsync openssh-client # set CROSS_CONTAINER_IN_CONTAINER to inform `cross` that it is executed from within a container ENV CROSS_CONTAINER_IN_CONTAINER=true From 5cf943f9e41d2e2b6ea3d11ddeb662e9317323ef Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 18:48:48 +0200 Subject: [PATCH 06/19] just what is the issue? --- automation/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index d97bc07..fc52cc5 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -2,11 +2,10 @@ # docker build -f automation/Dockerfile -t . # docker run -it FROM rust:latest -RUN apt-get update -RUN apt-get --yes upgrade +RUN apt-get update && apt-get --yes upgrade # tzdata is a dependency, won't install otherwise ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get --yes install rsync openssh-client +# RUN apt-get --yes install rsync openssh-client # set CROSS_CONTAINER_IN_CONTAINER to inform `cross` that it is executed from within a container ENV CROSS_CONTAINER_IN_CONTAINER=true @@ -14,7 +13,7 @@ ENV CROSS_CONTAINER_IN_CONTAINER=true RUN rustup install nightly && \ rustup target add thumbv7em-none-eabihf armv7-unknown-linux-gnueabihf && \ rustup component add rustfmt clippy -RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked +# RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked # SSH stuff to allow deployment to doc server RUN adduser --uid 114 jenkins From 0d0cc98dfe56ee7c29081c2a0e8d95041d09dba8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:13:49 +0200 Subject: [PATCH 07/19] is it the ssh client --- automation/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index fc52cc5..013425f 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -5,7 +5,7 @@ FROM rust:latest RUN apt-get update && apt-get --yes upgrade # tzdata is a dependency, won't install otherwise ARG DEBIAN_FRONTEND=noninteractive -# RUN apt-get --yes install rsync openssh-client +RUN apt-get --yes install rsync # set CROSS_CONTAINER_IN_CONTAINER to inform `cross` that it is executed from within a container ENV CROSS_CONTAINER_IN_CONTAINER=true @@ -13,7 +13,7 @@ ENV CROSS_CONTAINER_IN_CONTAINER=true RUN rustup install nightly && \ rustup target add thumbv7em-none-eabihf armv7-unknown-linux-gnueabihf && \ rustup component add rustfmt clippy -# RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked +RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked # SSH stuff to allow deployment to doc server RUN adduser --uid 114 jenkins From 0b0d7a44c3705d2ea5cb21871bd05161a71901bd Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:14:25 +0200 Subject: [PATCH 08/19] let's try this --- automation/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 12beda8..d13c168 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -58,6 +58,7 @@ pipeline { stage('Deploy satrs-book') { when { branch 'main' + branch 'prep-book-release' } steps { dir('satrs-book') { From 97a7c994b83482a7e769b66818727561ca3ad760 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:20:48 +0200 Subject: [PATCH 09/19] why does the cargo usage mess up everything? --- automation/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index 013425f..33bfea9 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -13,7 +13,7 @@ ENV CROSS_CONTAINER_IN_CONTAINER=true RUN rustup install nightly && \ rustup target add thumbv7em-none-eabihf armv7-unknown-linux-gnueabihf && \ rustup component add rustfmt clippy -RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked +# RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked # SSH stuff to allow deployment to doc server RUN adduser --uid 114 jenkins From 86f2c2acec24d4f63ea3928c5314aed98a09ad21 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:21:44 +0200 Subject: [PATCH 10/19] what is this shit --- automation/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index 33bfea9..cc6e6b7 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -13,11 +13,11 @@ ENV CROSS_CONTAINER_IN_CONTAINER=true RUN rustup install nightly && \ rustup target add thumbv7em-none-eabihf armv7-unknown-linux-gnueabihf && \ rustup component add rustfmt clippy -# RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked +RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked # SSH stuff to allow deployment to doc server -RUN adduser --uid 114 jenkins +# RUN adduser --uid 114 jenkins # Add documentation server to known hosts -RUN echo "|1|/LzCV4BuTmTb2wKnD146l9fTKgQ=|NJJtVjvWbtRt8OYqFgcYRnMQyVw= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts -RUN echo "|1|CcBvBc3EG03G+XM5rqRHs6gK/Gg=|oGeJQ+1I8NGI2THIkJsW92DpTzs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts +#RUN echo "|1|/LzCV4BuTmTb2wKnD146l9fTKgQ=|NJJtVjvWbtRt8OYqFgcYRnMQyVw= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts +#RUN echo "|1|CcBvBc3EG03G+XM5rqRHs6gK/Gg=|oGeJQ+1I8NGI2THIkJsW92DpTzs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts From 822023fc8a06985974317128db3185524fee156a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:24:17 +0200 Subject: [PATCH 11/19] this is stupid --- automation/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index cc6e6b7..33bfea9 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -13,11 +13,11 @@ ENV CROSS_CONTAINER_IN_CONTAINER=true RUN rustup install nightly && \ rustup target add thumbv7em-none-eabihf armv7-unknown-linux-gnueabihf && \ rustup component add rustfmt clippy -RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked +# RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked # SSH stuff to allow deployment to doc server -# RUN adduser --uid 114 jenkins +RUN adduser --uid 114 jenkins # Add documentation server to known hosts -#RUN echo "|1|/LzCV4BuTmTb2wKnD146l9fTKgQ=|NJJtVjvWbtRt8OYqFgcYRnMQyVw= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts -#RUN echo "|1|CcBvBc3EG03G+XM5rqRHs6gK/Gg=|oGeJQ+1I8NGI2THIkJsW92DpTzs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts +RUN echo "|1|/LzCV4BuTmTb2wKnD146l9fTKgQ=|NJJtVjvWbtRt8OYqFgcYRnMQyVw= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts +RUN echo "|1|CcBvBc3EG03G+XM5rqRHs6gK/Gg=|oGeJQ+1I8NGI2THIkJsW92DpTzs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts From 67fdfb98e53f7eb48c9b16109d1dbdedc4c90161 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:28:02 +0200 Subject: [PATCH 12/19] let's try something else --- automation/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/Dockerfile b/automation/Dockerfile index 33bfea9..d595b60 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -13,7 +13,9 @@ ENV CROSS_CONTAINER_IN_CONTAINER=true RUN rustup install nightly && \ rustup target add thumbv7em-none-eabihf armv7-unknown-linux-gnueabihf && \ rustup component add rustfmt clippy + # RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked +curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.34/mdbook-v0.4.34-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory /usr/local/bin # SSH stuff to allow deployment to doc server RUN adduser --uid 114 jenkins From 7af3888f90dc7fa057013761f0ae86a156a53f2b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:29:35 +0200 Subject: [PATCH 13/19] install curl --- automation/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index d595b60..aa0d64b 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -5,7 +5,7 @@ FROM rust:latest RUN apt-get update && apt-get --yes upgrade # tzdata is a dependency, won't install otherwise ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get --yes install rsync +RUN apt-get --yes install rsync curl # set CROSS_CONTAINER_IN_CONTAINER to inform `cross` that it is executed from within a container ENV CROSS_CONTAINER_IN_CONTAINER=true From a0b071656429072ac9afadcd7f973e13ddf1c9e7 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:31:02 +0200 Subject: [PATCH 14/19] let's try this --- automation/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index aa0d64b..b046564 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -15,7 +15,7 @@ RUN rustup install nightly && \ rustup component add rustfmt clippy # RUN cargo install mdbook --no-default-features --features search --vers "^0.4" --locked -curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.34/mdbook-v0.4.34-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory /usr/local/bin +RUN curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.34/mdbook-v0.4.34-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory /usr/local/bin # SSH stuff to allow deployment to doc server RUN adduser --uid 114 jenkins From 01b55a1df136301be864973219a1954ed7858d97 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:35:29 +0200 Subject: [PATCH 15/19] that should work --- automation/Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index d13c168..089d15b 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -57,8 +57,10 @@ pipeline { } stage('Deploy satrs-book') { when { - branch 'main' - branch 'prep-book-release' + anyOf { + branch 'main' + branch 'prep-book-release' + } } steps { dir('satrs-book') { From cd3e213b1e37cad283c629a6268014002618ad15 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:39:03 +0200 Subject: [PATCH 16/19] let's try this --- automation/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 089d15b..2cb8164 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { when { anyOf { branch 'main' - branch 'prep-book-release' + branch pattern: "mdbook-deployment*" } } steps { From d85a684333d580084a851e8c8bc774055a7683f9 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:40:53 +0200 Subject: [PATCH 17/19] need those semi-colons --- automation/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 2cb8164..230dbba 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -58,8 +58,8 @@ pipeline { stage('Deploy satrs-book') { when { anyOf { - branch 'main' - branch pattern: "mdbook-deployment*" + branch 'main'; + branch pattern: 'mdbook-deployment*' } } steps { From 81a9584dc4814a8212441e7c38d261f32dd66a91 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:50:13 +0200 Subject: [PATCH 18/19] forgot the shell wrapper --- automation/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 230dbba..937fea1 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -64,7 +64,7 @@ pipeline { } steps { dir('satrs-book') { - mdbook build + sh 'mdbook build' sshagent(credentials: ['documentation-buildfix']) { // Deploy to Apache webserver sh 'rsync -r --delete book/ buildfix@documentation.irs.uni-stuttgart.de:/projects/sat-rs' From 06e3d32217ca68c20632a2d648731da874a9ee53 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Sep 2023 19:54:02 +0200 Subject: [PATCH 19/19] better formulation --- satrs-book/src/communication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/satrs-book/src/communication.md b/satrs-book/src/communication.md index 447ebfd..8e8acd7 100644 --- a/satrs-book/src/communication.md +++ b/satrs-book/src/communication.md @@ -1,6 +1,6 @@ # Communication with sat-rs based software -Communication is a huge topic for space systems. Remote systems are usually not (directly) +Communication is a vital topic for remote system which are usually not (directly) connected to the internet and only have 1-2 communication links during nominal operation. However, most of these systems have internet access during development cycle. There are various standards provided by CCSDS and ECSS which can be useful to determine how to communicate with the satellite