diff options
| author | Craig Jennings <c@cjennings.net> | 2026-01-24 18:52:34 -0600 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-01-24 18:52:34 -0600 |
| commit | d63ba1f5e6919cd14c95f7209c38db0ff0632ce5 (patch) | |
| tree | 94a4fefdccc5cc1750a7466b3764b44bf1b8d0b0 /scripts | |
| parent | 6ce385c2be62492d43ef90b9525d38edc7cd8190 (diff) | |
This flag was removed from archsetup but remained in test scripts.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/testing/run-test-baremetal.sh | 13 | ||||
| -rwxr-xr-x | scripts/testing/run-test.sh | 21 |
2 files changed, 6 insertions, 28 deletions
diff --git a/scripts/testing/run-test-baremetal.sh b/scripts/testing/run-test-baremetal.sh index 709f030..c108e6f 100755 --- a/scripts/testing/run-test-baremetal.sh +++ b/scripts/testing/run-test-baremetal.sh @@ -24,7 +24,6 @@ source "$SCRIPT_DIR/lib/validation.sh" # Parse arguments ROLLBACK_FIRST=false ROLLBACK_AFTER=false -SKIP_SLOW_PACKAGES=false TARGET_HOST="" ROOT_PASSWORD="" @@ -38,7 +37,6 @@ usage() { echo "Options:" echo " --rollback-first Roll back to genesis snapshots before running" echo " --rollback-after Roll back to genesis snapshots after test (cleanup)" - echo " --skip-slow-packages Skip slow packages for faster testing" echo " --validate-only Skip archsetup, only run validation checks" echo " --help Show this help" exit 1 @@ -64,10 +62,6 @@ while [[ $# -gt 0 ]]; do ROLLBACK_AFTER=true shift ;; - --skip-slow-packages) - SKIP_SLOW_PACKAGES=true - shift - ;; --validate-only) VALIDATE_ONLY=true shift @@ -173,14 +167,9 @@ if ! $VALIDATE_ONLY; then info "This will take 30-60 minutes" REMOTE_LOG="/tmp/archsetup-test/archsetup-output.log" - ARCHSETUP_ARGS="" - if $SKIP_SLOW_PACKAGES; then - ARCHSETUP_ARGS="--skip-slow-packages" - info "Running with --skip-slow-packages" - fi # Start archsetup in background - ssh_cmd "cd /tmp/archsetup-test && nohup bash archsetup $ARCHSETUP_ARGS > $REMOTE_LOG 2>&1 &" + ssh_cmd "cd /tmp/archsetup-test && nohup bash archsetup > $REMOTE_LOG 2>&1 &" success "ArchSetup started in background" # Poll for completion diff --git a/scripts/testing/run-test.sh b/scripts/testing/run-test.sh index e06d177..4c41cc3 100755 --- a/scripts/testing/run-test.sh +++ b/scripts/testing/run-test.sh @@ -28,7 +28,6 @@ source "$SCRIPT_DIR/lib/validation.sh" KEEP_VM=false ARCHSETUP_SCRIPT="$PROJECT_ROOT/archsetup" SNAPSHOT_NAME="clean-install" -SKIP_SLOW_PACKAGES=false while [[ $# -gt 0 ]]; do case $1 in @@ -44,16 +43,11 @@ while [[ $# -gt 0 ]]; do SNAPSHOT_NAME="$2" shift 2 ;; - --skip-slow-packages) - SKIP_SLOW_PACKAGES=true - shift - ;; *) - echo "Usage: $0 [--keep] [--script /path/to/archsetup] [--snapshot name] [--skip-slow-packages]" - echo " --keep Keep VM in post-test state (for debugging)" - echo " --script Specify custom archsetup script to test" - echo " --snapshot Snapshot name to revert to (default: clean-install)" - echo " --skip-slow-packages Skip slow packages (texlive-meta, topgrade) for faster testing" + echo "Usage: $0 [--keep] [--script /path/to/archsetup] [--snapshot name]" + echo " --keep Keep VM in post-test state (for debugging)" + echo " --script Specify custom archsetup script to test" + echo " --snapshot Snapshot name to revert to (default: clean-install)" exit 1 ;; esac @@ -194,13 +188,8 @@ info "Log file: $LOGFILE" # Start archsetup in a detached session on the VM (resilient to SSH disconnections) REMOTE_LOG="/tmp/archsetup-test/archsetup-output.log" -ARCHSETUP_ARGS="" -if $SKIP_SLOW_PACKAGES; then - ARCHSETUP_ARGS="--skip-slow-packages" - info "Running archsetup with --skip-slow-packages flag" -fi sshpass -p "$ROOT_PASSWORD" ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ - "root@$VM_IP" "cd /tmp/archsetup-test && nohup bash archsetup $ARCHSETUP_ARGS > $REMOTE_LOG 2>&1 & echo \$!" \ + "root@$VM_IP" "cd /tmp/archsetup-test && nohup bash archsetup > $REMOTE_LOG 2>&1 & echo \$!" \ >> "$LOGFILE" 2>&1 if [ $? -ne 0 ]; then |
