birdhouse-compose.sh: fix regression with restart command #515
Conversation
This file contains hidden or 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
ci/deployment
Collaborator
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/3143/Result ❌ FAILUREBIRDHOUSE_DEPLOY_BRANCH : fix-compose-restart-command DACCS_IAC_BRANCH : master DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-91.rdext.crim.ca PAVICS-e2e-workflow-tests Pipeline ResultsTests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/104/NOTEBOOK TEST RESULTS |
birdhouse/birdhouse-compose.sh
Outdated
|
|
||
| if [ x"$1" = x"up" ] || [ x"$1" = x"restart" ]; then | ||
| COMPOSE_EXTRA_OPTS="${BIRDHOUSE_COMPOSE_UP_EXTRA_OPTS}" | ||
| if [ x"$1" = x"up" ]; then |
Collaborator
There was a problem hiding this comment.
Can you move this out of the outer if statement. Otherwise it makes it seem like this is directly related to the pre-compose-up scripts.
CHANGES.md
Outdated
|
|
||
| - Wrong compose up extra arguments given to compose restart | ||
|
|
||
| * When setting `BIRDHOUSE_COMPOSE_UP_EXTRA_OPTS="--remove-orphans"` in |
Collaborator
There was a problem hiding this comment.
Can you reword this so that it's clear that --remove-orphans is one example but that this applies to any additional option that only applies to up.
mishaschwartz
approved these changes
Mar 20, 2025
Collaborator
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/3144/Result ❌ FAILUREBIRDHOUSE_DEPLOY_BRANCH : fix-compose-restart-command DACCS_IAC_BRANCH : master DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-91.rdext.crim.ca PAVICS-e2e-workflow-tests Pipeline ResultsTests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/105/NOTEBOOK TEST RESULTS |
fmigneault
reviewed
Mar 20, 2025
CHANGES.md
Outdated
Comment on lines
20
to
24
| - Wrong compose up extra arguments given to compose restart | ||
|
|
||
| * For example, when setting `BIRDHOUSE_COMPOSE_UP_EXTRA_OPTS="--remove-orphans"` in | ||
| `env.local`, that `--remove-orphans` flag is not supposed to be used with | ||
| compose restart. Fix regression from |
Member
There was a problem hiding this comment.
Just need to use the code for the up and restart command.
Rest of PR is good.
Collaborator
Author
|
I guess I'll merge without bumping tag to 2.11 ? |
Collaborator
Collaborator
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/3146/Result ✅ SUCCESSBIRDHOUSE_DEPLOY_BRANCH : fix-compose-restart-command DACCS_IAC_BRANCH : master DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-91.rdext.crim.ca PAVICS-e2e-workflow-tests Pipeline ResultsTests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/106/NOTEBOOK TEST RESULTS |
Member
|
I'm actually in favor of merging within 2.11 because the change that led to this regression is within that version, so no need to purposely release a problematic version if we already got the fix. |
fmigneault
approved these changes
Mar 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Fix
birdhouse-compose.sh restartcommand, regression from #492.Changes
Non-breaking changes
birdhouse-compose.sh restartcommand, regression from Add integration test framework #492.CI Operations
birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false