ci: Fix restoring the domain and skeleton of the main and real-fed se… #13581
Conversation
…rver Before both used the same variables to store the data 🙈 Signed-off-by: Joas Schilling <[email protected]>
|
/backport to stable30 |
|
/backport to stable30.0 |
|
/backport to stable29 |
nickvergessen
deleted the
ci/noid/fix-restoring-main-and-real-fed-data
branch
| ${ROOT_DIR}/occ config:system:set overwrite.cli.url --value "http://localhost:8080/" | ||
| if [[ "$MAIN_SKELETON_DIR" != "" && -d $MAIN_SKELETON_DIR ]]; then |
There was a problem hiding this comment.
Should it be simply tested if the value is set, rather than if it is set and the directory exist? If it is set but it does not exist the tests would use it rather than the default skeleton directory*, which would make the tests fail if they are expecting some file from the default skeleton directory.
*Unless there is a fallback in Nextcloud code in case the configured skeleton directory does not exist, I have not checked that.
There was a problem hiding this comment.
yeah that might have been an attempt to find the root cause on my side. The problem turned out to be the overwriting from 2 different servers 🙈
| ${ROOT_DIR}/occ config:system:delete skeletondirectory | ||
| fi | ||
| done | ||
| if [[ "$REAL_FEDERATED_SKELETON_DIR" != "" && -d $REAL_FEDERATED_SKELETON_DIR ]]; then |
| export NEXTCLOUD_CONFIG_DIR="$MAIN_SERVER_CONFIG_DIR" | ||
| ${ROOT_DIR}/occ app:disable spreedcheats | ||
| ${ROOT_DIR}/occ config:system:set overwrite.cli.url --value "$MAIN_OVERWRITE_CLI_URL" | ||
| if [[ "$MAIN_SKELETON_DIR" != "" && -d $MAIN_SKELETON_DIR ]]; then |
There was a problem hiding this comment.
Same as above (ok, not exactly the same because here is the restoring).
| export NEXTCLOUD_CONFIG_DIR="$REAL_FEDERATED_SERVER_CONFIG_DIR" | ||
| ${ROOT_DIR}/occ app:disable spreedcheats | ||
| ${ROOT_DIR}/occ config:system:set overwrite.cli.url --value "$REAL_FEDERATED_OVERWRITE_CLI_URL" | ||
| if [[ "$REAL_FEDERATED_SKELETON_DIR" != "" && -d $REAL_FEDERATED_SKELETON_DIR ]]; then |
| if $DESTROY_REAL_FEDERATED_SERVER; then | ||
| rm -rf "$REAL_FEDERATED_SERVER_CONFIG_DIR" "$REAL_FEDERATED_SERVER_DATA_DIR" | ||
| rm -rf "'$REAL_FEDERATED_SERVER_CONFIG_DIR'" "'$REAL_FEDERATED_SERVER_DATA_DIR'" |
There was a problem hiding this comment.
Why the single quotes inside the double quotes? 🤔
…rver
Before both used the same variables to store the data 🙈
🛠️ API Checklist
🏁 Checklist
docs/has been updated or is not required