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

Config improvements #90

Merged
merged 17 commits into from
Jun 11, 2024
Merged

Config improvements #90

merged 17 commits into from
Jun 11, 2024

Conversation

Theodlz
Copy link
Collaborator

@Theodlz Theodlz commented Jun 4, 2024

  • remove the config.defaults.yaml from extensions/skyportal
  • instead, load the baselayer default config -> skyportal default config -> icare default config -> icare user defined config (optional), each overwriting the previous config files for the keys that they share. The resulting "complete" config is written as the config.yaml used in patched_skyportal.
  • add a icare_prod.sh script to use on the IJCLAB machine, as the modifications that were made to the icare.sh script to make it work in prod broke the CI.
  • updated the layout of the extensions/skyportal dir to reflect the changes made on main, fixed the imports where needed.

…yaml config on top of the icare default + skyportal + baselayer config
@Theodlz
Copy link
Collaborator Author

Theodlz commented Jun 4, 2024

CI should run here, and if not then I need to fix some things before merging @JulienPeloton!

@JulienPeloton
Copy link
Collaborator

Thanks @Theodlz -- the CI fails with various errors. I'll let you have a look?

…l so that the icare-specific config is present when running the tests
@Theodlz
Copy link
Collaborator Author

Theodlz commented Jun 4, 2024

On it @JulienPeloton. Some of the CI might fail anyway (some tests are flaky), but as long as it actually runs and not everything is red (which tells us that the app starts properly), I think it's enough.

@Theodlz
Copy link
Collaborator Author

Theodlz commented Jun 5, 2024

@JulienPeloton bunch of failures in the CI but the app does boot up properly and things are running. I'll investigate the failures later but I doubt any of them are caused by this PR, it's been there but wasn't visible since the CI was outdated and literally not running.

@Theodlz Theodlz merged commit 656908f into main Jun 11, 2024
5 of 8 checks passed
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.

2 participants