Feature/testing oss new#735
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the RDK distro configuration to add middleware/OSS “oss-testing” IPK feeds and to extend the stack layer extension value using architecture-specific variables.
Changes:
- Add
STACK_LAYER_EXTENSIONinitialization based onMIDDLEWARE_ARCH - Add middleware debug IPK feed (
MW_IPK_SERVER_PATH) toIPK_FEED_URIS - Add OSS-layer debug IPK feed (
MW_OSS_IPK_SERVER_PATH) toIPK_FEED_URISand appendOSS_LAYER_ARCHtoSTACK_LAYER_EXTENSION
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| STACK_LAYER_EXTENSION = "${MIDDLEWARE_ARCH}" | ||
|
|
||
| MW_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/ipks/debug" | ||
| IPK_FEED_URIS += " ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH}" | ||
|
|
||
| # Make sure get_oss_arch(d) is defined before this is used | ||
| STACK_LAYER_EXTENSION += " ${OSS_LAYER_ARCH}" | ||
|
|
||
| MW_OSS_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/${OSS_LAYER_ARCH}/ipks/debug" | ||
| IPK_FEED_URIS += " ${OSS_LAYER_ARCH}##${MW_OSS_IPK_SERVER_PATH}" |
There was a problem hiding this comment.
OSS_LAYER_ARCH is referenced to build STACK_LAYER_EXTENSION and an IPK_FEED_URIS entry, but it is not defined anywhere in this repository (the only occurrence is commented out in conf/distro/include/rdkb.inc). As a result it will expand to an empty string, producing a malformed feed entry (empty feed name) and a URL path segment like .../${MACHINE}//ipks/.... Define OSS_LAYER_ARCH (or derive it) before using it here, or conditionally append these values only when OSS_LAYER_ARCH is non-empty.
| STACK_LAYER_EXTENSION = "${MIDDLEWARE_ARCH}" | |
| MW_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/ipks/debug" | |
| IPK_FEED_URIS += " ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH}" | |
| # Make sure get_oss_arch(d) is defined before this is used | |
| STACK_LAYER_EXTENSION += " ${OSS_LAYER_ARCH}" | |
| MW_OSS_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/${OSS_LAYER_ARCH}/ipks/debug" | |
| IPK_FEED_URIS += " ${OSS_LAYER_ARCH}##${MW_OSS_IPK_SERVER_PATH}" | |
| OSS_LAYER_ARCH ?= "" | |
| STACK_LAYER_EXTENSION = "${MIDDLEWARE_ARCH}" | |
| MW_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/ipks/debug" | |
| IPK_FEED_URIS += " ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH}" | |
| # Make sure get_oss_arch(d) is defined before this is used | |
| STACK_LAYER_EXTENSION += "${@' ' + d.getVar('OSS_LAYER_ARCH') if d.getVar('OSS_LAYER_ARCH') else ''}" | |
| MW_OSS_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/${OSS_LAYER_ARCH}/ipks/debug" | |
| IPK_FEED_URIS += "${@' ' + d.getVar('OSS_LAYER_ARCH') + '##' + d.getVar('MW_OSS_IPK_SERVER_PATH') if d.getVar('OSS_LAYER_ARCH') else ''}" |
| MW_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/ipks/debug" | ||
| IPK_FEED_URIS += " ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH}" | ||
|
|
||
| # Make sure get_oss_arch(d) is defined before this is used |
There was a problem hiding this comment.
This comment mentions get_oss_arch(d), but there is no get_oss_arch definition or usage anywhere in the repo, and the code below is using OSS_LAYER_ARCH directly. Please update/remove this comment to reflect the actual source of OSS_LAYER_ARCH (or replace the variable usage with the intended get_oss_arch(d) expression if that was the goal).
| # Make sure get_oss_arch(d) is defined before this is used | |
| # Extend the stack layer extension using OSS_LAYER_ARCH directly |
| MW_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/ipks/debug" | ||
| IPK_FEED_URIS += " ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH}" | ||
|
|
||
| # Make sure get_oss_arch(d) is defined before this is used | ||
| STACK_LAYER_EXTENSION += " ${OSS_LAYER_ARCH}" | ||
|
|
||
| MW_OSS_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/${OSS_LAYER_ARCH}/ipks/debug" | ||
| IPK_FEED_URIS += " ${OSS_LAYER_ARCH}##${MW_OSS_IPK_SERVER_PATH}" |
There was a problem hiding this comment.
These artifactory debug IPK feeds are added unconditionally at the distro level. This can make all builds depend on network access/credentials to partners.artifactory.comcast.com and can unexpectedly pull debug packages. Consider gating these IPK_FEED_URIS additions behind an explicit feature/flag (e.g., a DISTRO_FEATURES entry or a dedicated oss-testing distro conf) so production/offline builds are unaffected by default.
| MW_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/ipks/debug" | |
| IPK_FEED_URIS += " ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH}" | |
| # Make sure get_oss_arch(d) is defined before this is used | |
| STACK_LAYER_EXTENSION += " ${OSS_LAYER_ARCH}" | |
| MW_OSS_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/${OSS_LAYER_ARCH}/ipks/debug" | |
| IPK_FEED_URIS += " ${OSS_LAYER_ARCH}##${MW_OSS_IPK_SERVER_PATH}" | |
| # Debug IPK feeds are opt-in so production/offline builds do not depend on | |
| # external Artifactory access unless explicitly enabled. | |
| RDK_ENABLE_DEBUG_IPK_FEEDS ?= "0" | |
| MW_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/ipks/debug" | |
| IPK_FEED_URIS += "${@oe.utils.conditional('RDK_ENABLE_DEBUG_IPK_FEEDS', '1', ' ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH}', '', d)}" | |
| # Make sure get_oss_arch(d) is defined before this is used | |
| STACK_LAYER_EXTENSION += " ${OSS_LAYER_ARCH}" | |
| MW_OSS_IPK_SERVER_PATH = "https://partners.artifactory.comcast.com/artifactory/middleware-dbg/oss-testing/${MACHINE}/${OSS_LAYER_ARCH}/ipks/debug" | |
| IPK_FEED_URIS += "${@oe.utils.conditional('RDK_ENABLE_DEBUG_IPK_FEEDS', '1', ' ${OSS_LAYER_ARCH}##${MW_OSS_IPK_SERVER_PATH}', '', d)}" |
No description provided.