fix: Use NFS_SHARE_PATH for artifact_dir validation and rename discovery scenario to provision#4614
Merged
Merged
Conversation
Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>
Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
…ery to provision - playbook_watcher_service.py: Replace hard-coded /opt/omnia/ prefix check for artifact_dir with dynamic NFS_SHARE_PATH. Fixes validate stage timeout caused by watcher rejecting valid NFS-based artifact paths. - .gitlab-ci-deploy-child-template.yml: Change scenario_names from 'discovery' to 'provision' to match the correct molecule scenario name.
abhishek-sa1
reviewed
Jun 1, 2026
| # The artifact base is derived from the NFS share (NFS_SHARE_PATH), | ||
| # so it must not be hard-coded to /opt/omnia. | ||
| nfs_base = str(NFS_SHARE_PATH).rstrip("/") | ||
| if ".." in artifact_dir or not artifact_dir.startswith(f"{nfs_base}/"): |
Collaborator
There was a problem hiding this comment.
@Rajeshkumar-s2 please check and update this change required or not?
Collaborator
There was a problem hiding this comment.
It won't be required. Only the scenarios names can be modified. ARtifacts directory is updated to use NFS directory as part of latest checkmarx fixes. https://github.com/dell/omnia/pull/4611/changes. i believe the conflicts are owing to that. Will sync with Balaji and take the relevant changes only.
Collaborator
Rajeshkumar-s2
left a comment
Rajeshkumar-s2
left a comment
There was a problem hiding this comment.
Balaji. Let us discuss this. Artifact directory path is fixed in my recent PR.
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
abhishek-sa1
approved these changes
Jun 1, 2026
Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
abhishek-sa1
approved these changes
Jun 1, 2026
Rajeshkumar-s2
approved these changes
Jun 1, 2026
abhishek-sa1
added a commit
that referenced
this pull request
Jun 1, 2026
* Add input config diff test & tool for comp aring expected vs actual build stream (adapter) outputs (#4586) * Add input config diff test & tool for comparing expected vs actual build stream (adapter) outputs Signed-off-by: venu <236371043+Venu-p1@users.noreply.github.com> * Updated example path Signed-off-by: Venu-p1 <236371043+Venu-p1@users.noreply.github.com> --------- Signed-off-by: venu <236371043+Venu-p1@users.noreply.github.com> Signed-off-by: Venu-p1 <236371043+Venu-p1@users.noreply.github.com> * Merge pull request #4614 from balajikumaran-c-s/pub/q2_dev fix: Use NFS_SHARE_PATH for artifact_dir validation and rename discovery scenario to provision --------- Signed-off-by: venu <236371043+Venu-p1@users.noreply.github.com> Signed-off-by: Venu-p1 <236371043+Venu-p1@users.noreply.github.com> Co-authored-by: Venu-p1 <236371043+Venu-p1@users.noreply.github.com> Co-authored-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
stage with
scenario_names: ["discovery"], but the correct molecule scenariois
provision.Root Cause
.gitlab-ci-deploy-child-template.ymlline 693: scenario name wasdiscoveryinstead of
provision.Fix
discoverytoprovision.Files Changed
gitlab/roles/hosted_gitlab/files/.gitlab-ci-deploy-child-template.yml