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

[QOLDEV-833] ensure plugins are installed in a viable order #433

Merged
merged 1 commit into from
May 10, 2024
Merged

[QOLDEV-833] ensure plugins are installed in a viable order #433

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions recipes/ckanweb-deploy-exts.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,23 @@
harvest_present = false
csrf_present = false

# Ensure plugins that depend on others are installed last
dependent_plugins = ['CKANExtArchiver', 'CKANExtQa', 'CKANExtHarvestDataQldGeoScience']
sorted_plugin_names = []
dependent_plugin_names = []
node['datashades']['ckan_web']['plugin_app_names'].each do |plugin|
if dependent_plugins.include? plugin then
dependent_plugin_names.append(plugin)
else
sorted_plugin_names.append(plugin)
end
end

# Ensure Archiver comes before QA
dependent_plugin_names.sort!

sorted_plugin_names.concat(dependent_plugin_names)
sorted_plugin_names.each do |plugin|

egg_name = `aws ssm get-parameter --region "#{node['datashades']['region']}" --name "/config/CKAN/#{node['datashades']['version']}/app/#{node['datashades']['app_id']}/plugin_apps/#{plugin}/shortname" --query "Parameter.Value" --output text`.strip

Expand Down
2 changes: 1 addition & 1 deletion resources/pip_install_app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
if [ -f "pip-requirements.txt" ]; then
REQUIREMENTS_FILES="$REQUIREMENTS_FILES -r pip-requirements.txt"
fi
#{pip} install -e . $REQUIREMENTS_FILES
#{pip} install -e . $REQUIREMENTS_FILES || exit 1
fi
EOS
end
Expand Down