fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

Catch 2 Update #538

Merged
mohr merged 13 commits from mueller/catch2-update into development 2022-01-31 15:18:43 +01:00
Conversation 6 Commits 13 Files Changed 3 +18 -35
muellerr commented 2022-01-27 11:32:54 +01:00
Owner
Copy Link
  1. Install Catch2 from sources inside a Docker stage/layer according to installation guide. Issues with FetchContent on CI server. Use version v3.0.0-preview4 now.
  2. Some tweaks to Jenkinsfile
1. Install Catch2 from sources inside a Docker stage/layer according to [installation guide](https://github.com/catchorg/Catch2/blob/devel/docs/cmake-integration.md). Issues with `FetchContent` on CI server. Use version `v3.0.0-preview4` now. 2. Some tweaks to Jenkinsfile
muellerr added 4 commits 2022-01-27 11:33:05 +01:00
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
bc5a6b4a51
bump catch2 version to v3.0.0-preview4
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
fe95c3337a
changed builddir name in Jenkinsfile
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
c453af5911
cleanCI
fsfw/fsfw/pipeline/head This commit looks good Details
fsfw/fsfw/pipeline/pr-development This commit looks good Details
441b3b83c8
Changes to Dockerfile and Jenkinsfile 
1. Install Catch2 from sources inside a Docker stage/layer
2. Some tweaks to Jenkinsfile
muellerr requested review from mohr 2022-01-27 11:33:14 +01:00
muellerr requested review from gaisser 2022-01-27 11:33:14 +01:00
muellerr added this to the v4.0.0 milestone 2022-01-27 11:37:28 +01:00
mohr commented 2022-01-27 17:44:20 +01:00
Owner
Copy Link

I am not sure if it is good to build the docker image with a fixed tag.
As the build job runs for quite some time there might be more than one ob running at the same time. Those would share the docker tag and as such the image. Worst case, the docker image could change between different stages of one job as another job rebuilt the image with different dockerfile.

Was there a problem with the dockerfile { dir 'automation' option? As far as I can tell, when the additionalBuildArgs '--no-cache' option was not set, docker reused its cache to rebuild the image quite fast.

I am not sure if it is good to build the docker image with a fixed tag. As the build job runs for quite some time there might be more than one ob running at the same time. Those would share the docker tag and as such the image. Worst case, the docker image could change between different stages of one job as another job rebuilt the image with different dockerfile. Was there a problem with the `dockerfile { dir 'automation'` option? As far as I can tell, when the `additionalBuildArgs '--no-cache'` option was not set, docker reused its cache to rebuild the image quite fast.
muellerr commented 2022-01-27 18:19:48 +01:00
Author
Owner
Copy Link

No, this can be reverted, I've taken this from the EIVE dockerfile. If the other way is better, this should be fixed in the Dockerfile of eive-obsw as well.

No, this can be reverted, I've taken this from the EIVE dockerfile. If the other way is better, this should be fixed in the Dockerfile of `eive-obsw` as well.
muellerr added 1 commit 2022-01-28 13:33:59 +01:00
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
386843e3e7
update jenkinsfile
muellerr added 1 commit 2022-01-28 13:36:49 +01:00
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
8414c9d471
added steps
muellerr added 1 commit 2022-01-28 13:43:26 +01:00
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
cf3d4d8de3
cleanDocker
muellerr added 1 commit 2022-01-28 13:46:11 +01:00
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
bf7fabd7ba
commented out when block
muellerr commented 2022-01-28 13:48:27 +01:00
Author
Owner
Copy Link

Any idea on why it is not building now are appreciated :)

Any idea on why it is not building now are appreciated :)
mohr added 1 commit 2022-01-28 14:10:29 +01:00
fsfw/fsfw/pipeline/pr-development This commit looks good Details
eba9abfc9a Jenkinsfile syntax is weird, maybe this works...
mohr commented 2022-01-28 14:12:28 +01:00
Owner
Copy Link

Variables only need to be referenced as "$VARIABLE" when used inside the steps. When used in the context of the Jenkinsfile itself, the can just be used as VARIABLE.

Build seems to run now.

Variables only need to be referenced as `"$VARIABLE"` when used inside the steps. When used in the context of the Jenkinsfile itself, the can just be used as `VARIABLE`. Build seems to run now.
mohr commented 2022-01-28 14:18:00 +01:00
Owner
Copy Link

As for the docker handling, I would vote on keeping the dockerfile syntax and thus also use it in eive-obsw.

As for the build steps, right now, stage('Create Docker') also cleans, making stage('Clean') redundant.

In a conversation with Robin S and Jonas, they suggested always reebuilding the docker (which we do right now) and also always doing a clean build in the CI to just avoid any "stuck" issues rightaway.

I think that we should do so, the time wasted on always cleaning is insignificant in realtion to the time spent building the docker image.

As for the docker handling, I would vote on keeping the dockerfile syntax and thus also use it in eive-obsw. As for the build steps, right now, `stage('Create Docker')` also cleans, making `stage('Clean')` redundant. In a conversation with Robin S and Jonas, they suggested always reebuilding the docker (which we do right now) and also always doing a clean build in the CI to just avoid any "stuck" issues rightaway. I think that we should do so, the time wasted on always cleaning is insignificant in realtion to the time spent building the docker image.
mohr added 1 commit 2022-01-31 14:59:50 +01:00
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
b98127cea6 Updated CI Build 
- Always clean and rebuild docker image.
- Use single docker container
mohr added 1 commit 2022-01-31 15:01:48 +01:00
fsfw/fsfw/pipeline/pr-development This commit looks good Details
5b968f7e5a Can't use env variables in top leve agent section
mohr removed review request for gaisser 2022-01-31 15:07:05 +01:00
mohr added 1 commit 2022-01-31 15:08:56 +01:00
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
1ead156c64 added --pull to the docker build
mohr added 1 commit 2022-01-31 15:11:40 +01:00
fsfw/fsfw/pipeline/pr-development This commit looks good Details
fsfw/fsfw/pipeline/head This commit looks good Details
8a39971a1c oops, wrong language
mohr commented 2022-01-31 15:17:59 +01:00
Owner
Copy Link

Cleaned up Jenkinsfile.

Now, docker pulls base image and rebuilds docker image on each run.
All steps are perfomed in one single docker container.

Cleaned up Jenkinsfile. Now, docker pulls base image and rebuilds docker image on each run. All steps are perfomed in one single docker container.
mohr self-assigned this 2022-01-31 15:18:11 +01:00
mohr approved these changes 2022-01-31 15:18:25 +01:00
mohr left a comment
Owner
Copy Link

I like what I did here.

I like what I did here.
mohr merged commit b83b2e8f89 into development 2022-01-31 15:18:43 +01:00
muellerr deleted branch mueller/catch2-update 2022-02-02 18:42:39 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
mohr
Labels
Clear labels   
API Change

Changes the API, so Users need to adapted

  
Breaking API Change

Changes the API in a non backwards compatible way

  
bug

Something is not working

  
build

Issues related to the buildsystem, including CI

  
cosmetics

Small change most users won't notice

  
Documentation

Improvement of code documentation

  
duplicate

This issue or pull request already exists

  
feature

New feature

  
help wanted

Need some help

  
hotfix

Quick or important fix that is merged directly into master, causing a new revision

  
invalid

#worksforme

  
question

More information is needed

  
Refactor

Contains a refactoring of some code

  
Tests

Issues related to testing code

  
wontfix

This won't be fixed

No Label
API Change
Breaking API Change
bug
build
cosmetics
Documentation
duplicate
feature
help wanted
hotfix
invalid
question
Refactor
Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
v4.0.0
Assignees
Clear assignees
No Assignees
mohr
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: fsfw/fsfw#538
No description provided.
Delete Branch "mueller/catch2-update"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?