Skip to content

Suggestion to fix collection requirements conflict #1468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Suggestion to fix collection requirements conflict #1468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aec332
Test fix collection installation
pagliaro-kandou Sep 7, 2023
83bae04
Test fix collection installation
pagliaro-kandou Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions services/tasks/LocalJob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ func (t *LocalJob) getEnvironmentENV() (arr []string, err error) {
}
}

environmentVars["ANSIBLE_COLLECTIONS_PATHS"] = fmt.Sprintf("%s/collections,%s/.ansible/collections",
t.getPlaybookDir(), os.UserHomeDir())

for key, val := range environmentVars {
arr = append(arr, fmt.Sprintf("%s=%s", key, val))
}
Expand Down Expand Up @@ -435,29 +438,24 @@ func (t *LocalJob) getPlaybookDir() string {
}

func (t *LocalJob) installCollectionsRequirements() error {
requirementsFilePath := path.Join(t.getPlaybookDir(), "collections", "requirements.yml")
requirementsHashFilePath := fmt.Sprintf("%s.md5", requirementsFilePath)
collectionsDirPath := path.Join(t.getPlaybookDir(), "collections")
requirementsFilePath := path.Join(collectionsDirPath, "requirements.yml")

if _, err := os.Stat(requirementsFilePath); err != nil {
t.Log("No collections/requirements.yml file found. Skip galaxy install process.\n")
return nil
}

if hasRequirementsChanges(requirementsFilePath, requirementsHashFilePath) {
if err := t.runGalaxy([]string{
"collection",
"install",
"-r",
requirementsFilePath,
"--force",
}); err != nil {
return err
}
if err := writeMD5Hash(requirementsFilePath, requirementsHashFilePath); err != nil {
return err
}
} else {
t.Log("collections/requirements.yml has no changes. Skip galaxy install process.\n")
if err := t.runGalaxy([]string{
"collection",
"install",
"-r",
requirementsFilePath,
"-p",
collectionsDirPath,
"--force",
}); err != nil {
return err
}

return nil
Expand Down