From 9c2ceb4a9f5dbe2517a224572846fa7a996ddcac Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 22 Feb 2022 11:29:23 +0100
Subject: [PATCH 1/2] one shot flag not static anymore

---
 CHANGELOG.md                                       | 6 ++++++
 tests/src/fsfw_tests/integration/task/TestTask.cpp | 1 -
 tests/src/fsfw_tests/integration/task/TestTask.h   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 335c0f7bb..ac5f004ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 # [unreleased]
 
+# [v5.0.0]
+
+## Changes
+
+- `oneShotAction` flag in the `TestTask` class is not static anymore
+
 # [v4.0.0]
 
 ## Additions
diff --git a/tests/src/fsfw_tests/integration/task/TestTask.cpp b/tests/src/fsfw_tests/integration/task/TestTask.cpp
index 65e444e38..765f780e6 100644
--- a/tests/src/fsfw_tests/integration/task/TestTask.cpp
+++ b/tests/src/fsfw_tests/integration/task/TestTask.cpp
@@ -3,7 +3,6 @@
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
 
-bool TestTask::oneShotAction = true;
 MutexIF* TestTask::testLock = nullptr;
 
 TestTask::TestTask(object_id_t objectId) : SystemObject(objectId), testMode(testModes::A) {
diff --git a/tests/src/fsfw_tests/integration/task/TestTask.h b/tests/src/fsfw_tests/integration/task/TestTask.h
index 557b50b21..cd630ee3a 100644
--- a/tests/src/fsfw_tests/integration/task/TestTask.h
+++ b/tests/src/fsfw_tests/integration/task/TestTask.h
@@ -29,7 +29,7 @@ class TestTask : public SystemObject, public ExecutableObjectIF, public HasRetur
   bool testFlag = false;
 
  private:
-  static bool oneShotAction;
+  bool oneShotAction = true;
   static MutexIF* testLock;
   StorageManagerIF* IPCStore;
 };

From f659f137599515995785bf768b6297eec4a1f91b Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Thu, 3 Mar 2022 16:03:06 +0100
Subject: [PATCH 2/2] Changing build to -j4 from -j to lessen load on build
 server

---
 automation/Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile
index 3424f986c..d1459e52f 100644
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@@ -21,14 +21,14 @@ pipeline {
         stage('Build') {
             steps {
                 dir(BUILDDIR) {
-                    sh 'cmake --build . -j'
+                    sh 'cmake --build . -j4'
                 }
             }
         }
         stage('Unittests') {
             steps {
                 dir(BUILDDIR) {
-                    sh 'cmake --build . -- fsfw-tests_coverage -j'
+                    sh 'cmake --build . -- fsfw-tests_coverage -j4'
                 }
             }
         }