Skip to content
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

Jump to bottom

Support unified requirements.yml for galaxy collections #1240

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Support unified requirements.yml for galaxy collections #1240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 46 additions & 18 deletions services/tasks/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,36 +505,64 @@ func (t *TaskRunner) updateRepository() error {
}

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

fallbackRequirementsFilePath := path.Join(t.getPlaybookDir(), "collections", "requirements.yml")
fallbackRequirementsHashFilePath := fmt.Sprintf("%s.md5", fallbackRequirementsFilePath)

if _, err := os.Stat(requirementsFilePath); err != nil {
t.Log("No collections/requirements.yml file found. Skip galaxy install process.\n")
t.Log("No <repo_path>/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 {
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("<repo_path>/collections/requirements.yml has no changes. Skip galaxy install process.\n")
return nil
}
} else {
t.Log("collections/requirements.yml has no changes. Skip galaxy install process.\n")
}

if _, err := os.Stat(fallbackRequirementsFilePath, fallbackRequirementsHashFilePath) err != nil {
t.Log("No <playbook_dir>/collections/requirements.yml file found. Skip galaxy install process.\n")
return nil
}
else {
if hasRequirementsChanges(fallbackRequirementsFilePath, fallbackRequirementsHashFilePath) {
if err := t.runGalaxy([]string{
"collection",
"install",
"-r",
fallbackRequirementsFilePath,
"--force",
}); err != nil {
return err
}
if err := writeMD5Hash(fallbackRequirementsFilePath, fallbackRequirementsHashFilePath); err != nil {
return err
}
} else {
t.Log("<playbook_dir>/collections/requirements.yml has no changes. Skip galaxy install process.\n")
return nil
}
}
return nil
}

func (t *TaskRunner) installRolesRequirements() error {
requirementsFilePath := fmt.Sprintf("%s/roles/requirements.yml", t.getRepoPath())
requirementsFilePath := path.Join(t.getRepoPath(), "roles", "requirements.yml")
requirementsHashFilePath := fmt.Sprintf("%s.md5", requirementsFilePath)

if _, err := os.Stat(requirementsFilePath); err != nil {
Expand Down