From c3abf4ba9c00e31f93e7d3a0d2d57f127d840410 Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Thu, 19 May 2022 16:36:48 +0200 Subject: [PATCH] Move virtual card CI test configs to card-functionality/ci/ (where configurations for tests on hardware cards already were). --- .gitlab-ci.yml | 6 +++--- .../{docker/test-fluffypgp.toml => ci/virt-fluffypgp.toml} | 0 .../{docker/test-smartpgp.toml => ci/virt-smartpgp.toml} | 0 .../{docker/test-ykneo.toml => ci/virt-ykneo.toml} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename card-functionality/{docker/test-fluffypgp.toml => ci/virt-fluffypgp.toml} (100%) rename card-functionality/{docker/test-smartpgp.toml => ci/virt-smartpgp.toml} (100%) rename card-functionality/{docker/test-ykneo.toml => ci/virt-ykneo.toml} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5318fd0..68aec10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,7 +138,7 @@ run_cardtest_smartpgp: - cargo run -p openpgp-card-tests --bin import -- $CONFIG - cargo run -p openpgp-card-tests --bin keygen -- $CONFIG variables: - CONFIG: "card-functionality/docker/test-smartpgp.toml" + CONFIG: "card-functionality/ci/virt-smartpgp.toml" cache: # inherit all general cache settings <<: *general_cache_config @@ -157,7 +157,7 @@ run_cardtest_ykneo: - cargo run -p openpgp-card-tests --bin import -- $CONFIG - cargo run -p openpgp-card-tests --bin keygen -- $CONFIG variables: - CONFIG: "card-functionality/docker/test-ykneo.toml" + CONFIG: "card-functionality/ci/virt-ykneo.toml" cache: # inherit all general cache settings <<: *general_cache_config @@ -176,7 +176,7 @@ run_cardtest_fluffypgp: - cargo run -p openpgp-card-tests --bin import -- $CONFIG - cargo run -p openpgp-card-tests --bin keygen -- $CONFIG variables: - CONFIG: "card-functionality/docker/test-fluffypgp.toml" + CONFIG: "card-functionality/ci/virt-fluffypgp.toml" cache: # inherit all general cache settings <<: *general_cache_config diff --git a/card-functionality/docker/test-fluffypgp.toml b/card-functionality/ci/virt-fluffypgp.toml similarity index 100% rename from card-functionality/docker/test-fluffypgp.toml rename to card-functionality/ci/virt-fluffypgp.toml diff --git a/card-functionality/docker/test-smartpgp.toml b/card-functionality/ci/virt-smartpgp.toml similarity index 100% rename from card-functionality/docker/test-smartpgp.toml rename to card-functionality/ci/virt-smartpgp.toml diff --git a/card-functionality/docker/test-ykneo.toml b/card-functionality/ci/virt-ykneo.toml similarity index 100% rename from card-functionality/docker/test-ykneo.toml rename to card-functionality/ci/virt-ykneo.toml