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.

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

Add missing script interpreters #19917

Merged
merged 1 commit into from
Mar 5, 2020

Conversation

d-m-u
Copy link
Contributor

@d-m-u d-m-u commented Mar 3, 2020

This is a start to a bug where scripts in tools should have the interpreter set if they are executable.

For https://bugzilla.redhat.com/show_bug.cgi?id=1751248

the only three that clearly needed the line:

  • ./ci/after_failure.sh
  • ./ci/before_install.sh
  • ./ci/setup_ruby_env.sh

have it already set:

./copy_reports_structure.rb
./reset_admin_password.rb

aren't stand alone scripts, ergo shouldn't need the interpreter:

./collect_logs/exclude_files
./copy_reports_structure/report_structure.rb
./server_settings_replicator/server_settings_replicator.rb
./fix_auth/auth_config_model.rb
./fix_auth/auth_model.rb
./radar/rollup_radar_mixin.rb
./fix_auth/models.rb
./fix_auth/fix_auth.rb
./fix_auth/cli.rb
./miqldap_to_sssd/sssd_conf/sssd.rb
./miqldap_to_sssd/auth_establish.rb
./miqldap_to_sssd/auth_template_files.rb
./miqldap_to_sssd/configure_apache.rb
./miqldap_to_sssd/configure_appliance_settings.rb
./miqldap_to_sssd/configure_database.rb
./miqldap_to_sssd/configure_selinux.rb
./miqldap_to_sssd/configure_sssd_rules.rb
./pg_inspector/connection_locks.rb
./pg_inspector/error.rb
./pg_inspector/pg_inspector_operation.rb
./miqldap_to_sssd/miqldap_configuration.rb
./pg_inspector/servers_to_yaml.rb
./pg_inspector/active_connections_to_human.rb
./pg_inspector/active_connections_to_yaml.rb
./miqldap_to_sssd/sssd_conf/common.rb
./miqldap_to_sssd/sssd_conf/domain.rb
./miqldap_to_sssd/converter.rb
./miqldap_to_sssd/services.rb
./miqldap_to_sssd/sssd_conf/pam.rb
./miqldap_to_sssd/sssd_conf/ifp.rb
./miqldap_to_sssd/sssd_conf.rb
./pg_inspector/util.rb
./miqldap_to_sssd/cli.rb
./pg_inspector/cli.rb

completed in a removal:

./migrate_policies (#19918)
./classify_vms_by_folder (#19923)

moved:

./radar/rollup_radar_mixin_spec.rb (#19926)

It's LJ's party:
@miq-bot assign @jrafanie

@miq-bot add_label bug

@d-m-u d-m-u requested review from Fryguy and gtanzillo as code owners March 3, 2020 17:26
@d-m-u d-m-u changed the title [WIP] Add missing script interpreters Add missing script interpreters Mar 4, 2020
@d-m-u
Copy link
Contributor Author

d-m-u commented Mar 4, 2020

@jrafanie this is ready for review

@miq-bot miq-bot removed the wip label Mar 4, 2020
@d-m-u
Copy link
Contributor Author

d-m-u commented Mar 4, 2020

@miq-bot remove_label wip

@d-m-u
Copy link
Contributor Author

d-m-u commented Mar 4, 2020

@miq-bot add_label ivanchuk/yes

@jrafanie
Copy link
Member

jrafanie commented Mar 4, 2020

Maybe do chmod +x tools/ci/* too?

What do you think?

related: #15957 #14169

@jrafanie
Copy link
Member

jrafanie commented Mar 4, 2020

Maybe do chmod +x tools/ci/* too?

What do you think?

related: #15957 #14169

I don't remember if github show file permissions but locally I get:

diff --git a/tools/ci/after_failure.sh b/tools/ci/after_failure.sh
old mode 100644
new mode 100755
diff --git a/tools/ci/before_install.sh b/tools/ci/before_install.sh
old mode 100644
new mode 100755
diff --git a/tools/ci/setup_ruby_env.sh b/tools/ci/setup_ruby_env.sh
old mode 100644
new mode 100755
diff --git a/tools/ci/setup_vmdb_configs.sh b/tools/ci/setup_vmdb_configs.sh
old mode 100644
new mode 100755

@jrafanie
Copy link
Member

jrafanie commented Mar 4, 2020

yay, thanks for cleaning this up

@d-m-u d-m-u force-pushed the fixing_missing_script_interpreters branch from 4ee925c to fec10db Compare March 5, 2020 04:06
@d-m-u
Copy link
Contributor Author

d-m-u commented Mar 5, 2020

whoa yeah it does:
Screen Shot 2020-03-04 at 11 07 13 PM

that's cool

@miq-bot
Copy link
Member

miq-bot commented Mar 5, 2020

Checked commit d-m-u@fec10db with ruby 2.5.7, rubocop 0.69.0, haml-lint 0.20.0, and yamllint
0 files checked, 0 offenses detected
Everything looks fine. 👍

@jrafanie jrafanie added this to the Sprint 132 Ending Mar 16, 2020 milestone Mar 5, 2020
@jrafanie jrafanie merged commit 6c5ee55 into ManageIQ:master Mar 5, 2020
@d-m-u d-m-u deleted the fixing_missing_script_interpreters branch March 5, 2020 16:42
simaishi pushed a commit that referenced this pull request Mar 20, 2020
@simaishi
Copy link
Contributor

Jansa backport details:

$ git log -1
commit e07f4a623eefd5cbd649e313df2eaf7c3f02029e
Author: Joe Rafaniello <[email protected]>
Date:   Thu Mar 5 11:42:04 2020 -0500

    Merge pull request #19917 from d-m-u/fixing_missing_script_interpreters

    Add missing script interpreters

    (cherry picked from commit 6c5ee55dd57f7535508133fb150139ec6376bddf)

    https://bugzilla.redhat.com/show_bug.cgi?id=1751248

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants