From e09fc63d5678f37e23381b86f1920a0005eda8b9 Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Fri, 21 Oct 2022 16:51:14 +0200 Subject: [PATCH] Use simplified start script for all virtual cards. --- .gitlab-ci.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26a7f8d..c1364f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -115,8 +115,7 @@ run_cardtest_smartpgp: stage: virtual-test image: registry.gitlab.com/openpgp-card/virtual-cards/smartpgp-builddeps script: - - /etc/init.d/pcscd start - - su - -c "sh /home/jcardsim/run-card.sh > /dev/null" jcardsim + - sh /start.sh - RUST_BACKTRACE=1 cargo run -p openpgp-card-tools --bin opgpcard -- status - RUST_BACKTRACE=1 cargo run -p openpgp-card-tools --bin opgpcard -- info - RUST_BACKTRACE=1 cargo run -p openpgp-card-tests --bin import -- $CONFIG @@ -152,8 +151,7 @@ run_cardtest_ykneo: stage: virtual-test image: registry.gitlab.com/openpgp-card/virtual-cards/ykneo-builddeps script: - - /etc/init.d/pcscd start - - su - -c "sh /home/jcardsim/run-card.sh > /dev/null" jcardsim + - sh /start.sh - RUST_BACKTRACE=1 cargo run -p openpgp-card-tools --bin opgpcard -- status - RUST_BACKTRACE=1 cargo run -p openpgp-card-tools --bin opgpcard -- info - RUST_BACKTRACE=1 cargo run -p openpgp-card-tests --bin import -- $CONFIG @@ -171,8 +169,7 @@ run_cardtest_fluffypgp: stage: virtual-test image: registry.gitlab.com/openpgp-card/virtual-cards/fluffypgp-builddeps script: - - /etc/init.d/pcscd start - - su - -c "sh /home/jcardsim/run-card.sh > /dev/null" jcardsim + - sh /start.sh - RUST_BACKTRACE=1 cargo run -p openpgp-card-tools --bin opgpcard -- status - RUST_BACKTRACE=1 cargo run -p openpgp-card-tools --bin opgpcard -- info - RUST_BACKTRACE=1 cargo run -p openpgp-card-tests --bin import -- $CONFIG