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

Fix global config for functional tests #3375

Merged
merged 4 commits into from
Sep 27, 2019
Merged

Conversation

hjoliver
Copy link
Member

@hjoliver hjoliver commented Sep 24, 2019

  • fix documentation and code associated with special global config file for the test battery (the installed global config - if any - has to be ignored by the tests)
    • restores cylc get-global --print-site-dir option used in the test header (we removed the option back in April for unknown reasons - accidentally?)
    • allows test and normal global config under /etc (site) and ~/.cylc (user)
    • corrects a few remaining isntances of the of old "global.rc" filename
  • removes outdated conda recipe from cylc-flow package resources

@wxtim - this makes use of flow.rc and flow-tests.rc consistent throughout cylc-flow for current usage; I think it will change to cylc-flow.rc later your config unification work

@matthewrmshin - have you been using a site config file for Cylc 8 tests? Seems like it would be broken at the moment. Either way, maybe you can check this while we still have you on the job?

This is a small change with no associated Issue.

Requirements check-list

  • I have read CONTRIBUTING.md and added my name as a Code Contributor.
  • Contains logically grouped changes (else tidy your branch by rebase).
  • Does not contain off-topic changes (use other PRs for other changes).
  • Already covered by existing tests.
  • No change log entry required (why? e.g. invisible to users).
  • No documentation update required.

@hjoliver hjoliver added the bug Something is wrong :( label Sep 24, 2019
@hjoliver hjoliver added this to the cylc-8.0a2 milestone Sep 24, 2019
@hjoliver hjoliver self-assigned this Sep 24, 2019
@matthewrmshin
Copy link
Contributor

matthewrmshin commented Sep 24, 2019

No, I have been running the test battery with no configuration since the Python 3 + ZMQ port - as we are still trying to figure out how to deploy Cylc 8 to some of our remote environments that have no Internet access. Now that we have the Conda environment, we should spend some time to get that sorted (noting cylc/cylc-admin#27 and #3376 ).

@wxtim
Copy link
Member

wxtim commented Sep 27, 2019

  • I've eyeballed it and am reasonably happy with the changes.
  • I have not yet got it working on my local machine, probably becuase I'm picking up an unwanted .rc file

Copy link
Member

@wxtim wxtim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now confident of tests. Sorry about the delay. :(

@wxtim wxtim merged commit 9ff5b77 into cylc:master Sep 27, 2019
@hjoliver hjoliver deleted the fix-site-conf branch October 6, 2019 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is wrong :(
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants