-
Notifications
You must be signed in to change notification settings - Fork 7
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
adjust public WPS outputs sub-dir for weaver #401
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
component/cowbird
Related to https://github.com/Ouranosinc/cowbird
documentation
Improvements or additions to documentation
labels
Nov 9, 2023
github-actions
bot
added
the
component/jupyterhub
Related to JupyterHub as development frontend with notebooks
label
Nov 9, 2023
fmigneault
commented
Nov 9, 2023
mishaschwartz
approved these changes
Nov 9, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, pending adding the variable to EXTRA_VARS
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/2224/Result : failure BIRDHOUSE_DEPLOY_BRANCH : fix-weaver-public-wps-outputs DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-46.rdext.crim.ca PAVICS-e2e-workflow-tests Pipeline ResultsTests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1405/NOTEBOOK TEST RESULTS |
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/2225/Result : failure BIRDHOUSE_DEPLOY_BRANCH : fix-weaver-public-wps-outputs DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-20.rdext.crim.ca PAVICS-e2e-workflow-tests Pipeline ResultsTests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1406/NOTEBOOK TEST RESULTS |
ChaamC
approved these changes
Nov 9, 2023
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/2227/Result : failure BIRDHOUSE_DEPLOY_BRANCH : fix-weaver-public-wps-outputs DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-46.rdext.crim.ca PAVICS-e2e-workflow-tests Pipeline ResultsTests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1408/NOTEBOOK TEST RESULTS |
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/2229/Result : failure BIRDHOUSE_DEPLOY_BRANCH : fix-weaver-public-wps-outputs DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : fix-weaver-nested-output-id DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-20.rdext.crim.ca Infrastructure deployment failed. Instance has not been destroyed. @matprov |
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/2231/Result : success BIRDHOUSE_DEPLOY_BRANCH : fix-weaver-public-wps-outputs DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : fix-weaver-nested-output-id DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-46.rdext.crim.ca PAVICS-e2e-workflow-tests Pipeline ResultsTests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1410/NOTEBOOK TEST RESULTS |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
ci/operations
Continuous Integration components
component/cowbird
Related to https://github.com/Ouranosinc/cowbird
component/jupyterhub
Related to JupyterHub as development frontend with notebooks
documentation
Improvements or additions to documentation
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Adjust public WPS outputs sub-dir for Weaver and Cowbird to align.
Changes
Non-breaking changes
Fix
weaver
andcowbird
inconsistencies forpublic
WPS outputs directory handling.Because
cowbird
needs to mount multiple directories within the user-workspace forjupyterhub
, it needs to definea dedicated
public/wps_outputs
sub-directory to distinguish it from otherpublic
files not part of WPS outputs.However, for WPS birds, other files than WPS outputs are irrelevant, and are therefore mounted directly in their
container. The variable
PUBLIC_WORKSPACE_WPS_OUTPUTS_SUBDIR
was being misused in the context ofweaver
,causing WPS output URLs for
public
context to be nested as/wpsoutputs/weaver/public/wps_outputs/{jobID}
instead of the intended location
/wpsoutputs/weaver/public/{jobID}
, in contrast to user-context WPS outputslocated under
/wpsoutputs/weaver/users/{userID}/{jobID}
.Breaking changes
Related Issue / Discussion
birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false