cFS-Bundle Integration Candidate:2021-08-10

[astrogeco]

Checklist (Please check before submitting)

• I reviewed the Contributing Guide.
• I signed and emailed the appropriate Contributor License agreement to [email protected] and copied [email protected].

Describe the contribution

PR #332

• Fix Skip documentation deploy job instead of step when not pushing to main #331, Skip deploy job instead of step

PR #323

• Fix Add Discussions in Contributing Guide #322, Add Discussions in the Contributing Guide

Also Combines

• cFE Integration candidate: 2021-08-10 cFE#1772, v6.8.0-rc1+dev844
• osal Integration candidate: 2021-08-10 osal#1127, v5.1.0-rc1+dev590

Includes

cFE

• Fix #1733, Move global count into test global struct. cFE#1737, Move global count into test global struct.
• Fix #806, Add application control functional tests cFE#1722, Add ES application control API functional tests
• Fix #1743, update coverage test to use UtAssert macros cFE#1744, update coverage test to use UtAssert macros
• Add table api functional tests cFE#1734, Add table api functional tests
• Fix #813, Add Generic Counter API test cFE#1753, Add Generic Counter API test
• Fix #1645, Add resource ID API functional tests cFE#1716, Add resource ID API functional tests
• Fix #1644, finish ES misc API functional test cFE#1766, Finish ES misc API functional test
• Fix #1763, last char truncated in coverage log output cFE#1764, Last char truncated in coverage log output
• Fix #1727, mistakes in some copyright headers cFE#1728, Mistakes in some copyright headers
• Fix #1692, Add misc time api functional test cFE#1767, Add misc time api functional test cFE
• Fix #1649, Add Functional Test for EVS Reset Filters API. cFE#1749, Add Functional Test for EVS Reset Filters API
• Fix #1774, replace VOIDCALL assert macro cFE#1796, replace VOIDCALL assert macro
• Fix #1780, RTEMS CFE_FT_Global build failure cFE#1781, RTEMS CFE_FT_Global build failure

osal

• Fix #1115, Add absolute branch coverage check osal#1117, Add absolute branch coverage check

Testing performed

cFE Checks https://github.com/nasa/cFE/pull/1772/checks
cFS Checks https://github.com/nasa/cFS/pull/333/checks
osal Checks https://github.com/nasa/osal/pull/1127/checks

Expected behavior changes
See PRs

System(s) tested on

CI

Ubuntu 18.04
RTEMS 4.11 (qemu)
RTEMS 5.0 (qemu)

Additional context
None

Contributor Info - All information REQUIRED for consideration of pull request

@jphickey
@zanzaben
@nmullane
@PavLL
@astrogeco
@ArielSAdamsNASA

[astrogeco]

@nmullane, @zanzaben looks like the test app isn't compiling isn't compiling on RTEMS

[zanzaben]

@nmullane, @zanzaben looks like the test app isn't compiling isn't compiling on RTEMS

@jphickey thoughts?

[zanzaben]

@nmullane your CFE_FT_Global changes are conflicting with nasa/cFE#1737

[astrogeco]

@nmullane your CFE_FT_Global changes are conflicting with nasa/cFE#1737

weird I thought I resolved them, and they seemed to work on Linux
https://github.com/astrogeco/cFE/actions?query=branch%3Aic-2021-08-10++

[nmullane]

@nmullane your CFE_FT_Global changes are conflicting with nasa/cFE#1737

I didn't think my table api functional tests were going to be included in this integration candidate, so I was waiting for nasa/cFE#1737 to be merged before updating my pr for the CCB this week.

[astrogeco]

my bad you all, this is what happens when I skip a couple of tagups :)

[astrogeco]

So looking at this more closely, only debug mode fails in Linux

Nvm that looks like a runner hiccup not a real fail

[astrogeco]

@zanzaben I don't think this is an actual conflict, wouldn't it fail to build on Linux if it were?