Skip to content

Conversation

@astrogeco
Copy link
Contributor

Describe the contribution
Fix #830

Testing performed

Expected behavior changes
Revision version number now reports 99 during development versions. ES Housekeeping data reports 6.7.99 in the version string.

System(s) tested on
Built and ran on Docker container.

Additional context
Also see nasa.osal#584

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Gerardo E. Cruz-Ortiz, NASA-GSFC

@astrogeco astrogeco marked this pull request as draft August 31, 2020 20:21
@astrogeco astrogeco force-pushed the 830-fix-version-es-hk branch from 4d840d8 to 55536c1 Compare August 31, 2020 20:38
The version number macros major, minor, and revision, are used in the HK telemetry which can lead to confusion.
@astrogeco astrogeco force-pushed the 830-fix-version-es-hk branch from 55536c1 to 6e73ee4 Compare September 2, 2020 01:26
@astrogeco astrogeco added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Sep 15, 2020
@yammajamma yammajamma added IC-20200916 and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Sep 16, 2020
@yammajamma yammajamma marked this pull request as ready for review September 17, 2020 13:39
@yammajamma
Copy link
Contributor

yammajamma commented Sep 17, 2020

CCB-20200916 APPROVED

@yammajamma yammajamma changed the base branch from main to integration-candidate September 17, 2020 13:41
@yammajamma yammajamma merged commit c879bb4 into nasa:integration-candidate Sep 17, 2020
astrogeco added a commit to astrogeco/cFS that referenced this pull request Oct 13, 2020
astrogeco added a commit that referenced this pull request Oct 13, 2020
Apply #853 to Bootes, Set Revision to 99 for development build
astrogeco added a commit to nasa/cFS that referenced this pull request Oct 14, 2020
astrogeco added a commit to nasa/sample_app that referenced this pull request Nov 3, 2020
This makes sample_app consistent with osal and cFE. See nasa/cFE#853 and nasa/osal#585

Also Applies clang-format
astrogeco added a commit to nasa/PSP that referenced this pull request Nov 4, 2020
Indicate unreleased development version by setting revision number to 99 to match cfe and osal. See nasa/cFE#853
ArielSAdamsNASA pushed a commit to nasa/PSP that referenced this pull request Jan 7, 2021
Indicate unreleased development version by setting revision number to 99 to match cfe and osal. See nasa/cFE#853
@astrogeco astrogeco deleted the 830-fix-version-es-hk branch April 7, 2021 18:03
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ES reports version 6.7.0 in telemetry, even when it's built off a development branch

3 participants