From 5c0e4e8373d9f1fb65d13fff823dce4c8c0e8c24 Mon Sep 17 00:00:00 2001 From: apldev3 Date: Wed, 22 May 2019 16:33:34 -0400 Subject: [PATCH] [#144] Rename integration-tests folder to setup under .ci directory (#145) --- .ci/docker/docker-compose-tpm2.yml | 4 ++-- .ci/docker/docker-compose.yml | 4 ++-- .ci/{integration-tests => setup}/certs/ca.crt | Bin .ci/{integration-tests => setup}/certs/ca.key | Bin .ci/{integration-tests => setup}/certs/ek_cert.der | Bin .ci/{integration-tests => setup}/setup-aca.sh | 0 .../setup-tpm2provisioner.sh | 4 ++-- .../setup-tpmprovisioner.sh | 0 .ci/system-tests/system_test.py | 4 ++-- 9 files changed, 8 insertions(+), 8 deletions(-) rename .ci/{integration-tests => setup}/certs/ca.crt (100%) rename .ci/{integration-tests => setup}/certs/ca.key (100%) rename .ci/{integration-tests => setup}/certs/ek_cert.der (100%) rename .ci/{integration-tests => setup}/setup-aca.sh (100%) rename .ci/{integration-tests => setup}/setup-tpm2provisioner.sh (94%) rename .ci/{integration-tests => setup}/setup-tpmprovisioner.sh (100%) diff --git a/.ci/docker/docker-compose-tpm2.yml b/.ci/docker/docker-compose-tpm2.yml index f104029c..db42edf8 100644 --- a/.ci/docker/docker-compose-tpm2.yml +++ b/.ci/docker/docker-compose-tpm2.yml @@ -9,7 +9,7 @@ services: ports: - "${HIRS_ACA_PORTAL_PORT}:${HIRS_ACA_PORTAL_CONTAINER_PORT}" entrypoint: /bin/bash -c - command: [HIRS/.ci/integration-tests/setup-aca.sh] + command: [HIRS/.ci/setup/setup-aca.sh] hostname: ${HIRS_ACA_HOSTNAME} networks: hirs_aca_system_tests: @@ -25,7 +25,7 @@ services: volumes: - ../../:/HIRS entrypoint: /bin/bash -c - command: [HIRS/.ci/integration-tests/setup-tpm2provisioner.sh; + command: [HIRS/.ci/setup/setup-tpm2provisioner.sh; HIRS/.ci/system-tests/systems-test-centos7-tpm2.sh] networks: hirs_aca_system_tests: diff --git a/.ci/docker/docker-compose.yml b/.ci/docker/docker-compose.yml index d8b67f6e..ac4bcf95 100644 --- a/.ci/docker/docker-compose.yml +++ b/.ci/docker/docker-compose.yml @@ -9,7 +9,7 @@ services: ports: - "${HIRS_ACA_PORTAL_PORT}:${HIRS_ACA_PORTAL_CONTAINER_PORT}" entrypoint: /bin/bash -c - command: [HIRS/.ci/integration-tests/setup-aca.sh] + command: [HIRS/.ci/setup/setup-aca.sh] hostname: ${HIRS_ACA_HOSTNAME} networks: hirs_aca_system_tests: @@ -25,7 +25,7 @@ services: volumes: - ../../:/HIRS entrypoint: /bin/bash -c - command: [HIRS/.ci/integration-tests/setup-tpmprovisioner.sh;] + command: [HIRS/.ci/setup/setup-tpmprovisioner.sh;] devices: - "/dev/mem:/dev/mem" cap_add: diff --git a/.ci/integration-tests/certs/ca.crt b/.ci/setup/certs/ca.crt similarity index 100% rename from .ci/integration-tests/certs/ca.crt rename to .ci/setup/certs/ca.crt diff --git a/.ci/integration-tests/certs/ca.key b/.ci/setup/certs/ca.key similarity index 100% rename from .ci/integration-tests/certs/ca.key rename to .ci/setup/certs/ca.key diff --git a/.ci/integration-tests/certs/ek_cert.der b/.ci/setup/certs/ek_cert.der similarity index 100% rename from .ci/integration-tests/certs/ek_cert.der rename to .ci/setup/certs/ek_cert.der diff --git a/.ci/integration-tests/setup-aca.sh b/.ci/setup/setup-aca.sh similarity index 100% rename from .ci/integration-tests/setup-aca.sh rename to .ci/setup/setup-aca.sh diff --git a/.ci/integration-tests/setup-tpm2provisioner.sh b/.ci/setup/setup-tpm2provisioner.sh similarity index 94% rename from .ci/integration-tests/setup-tpm2provisioner.sh rename to .ci/setup/setup-tpm2provisioner.sh index c875d998..c4e25ee7 100755 --- a/.ci/integration-tests/setup-tpm2provisioner.sh +++ b/.ci/setup/setup-tpm2provisioner.sh @@ -52,7 +52,7 @@ function InitTpm2Emulator { sleep 5 # EK and PC Certificate - ek_cert_der="/HIRS/.ci/integration-tests/certs/ek_cert.der" + ek_cert_der="/HIRS/.ci/setup/certs/ek_cert.der" platform_cert="platformAttributeCertificate.pem" echo "Creating Platform Cert for Container." @@ -62,7 +62,7 @@ function InitTpm2Emulator { /opt/paccor/scripts/referenceoptions.sh > $PC_DIR/optionsFile /opt/paccor/scripts/otherextensions.sh > $PC_DIR/extensionsFile /opt/paccor/bin/observer -c $PC_DIR/componentsFile -p $PC_DIR/optionsFile -e $ek_cert_der -f $PC_DIR/observerFile - /opt/paccor/bin/signer -o $PC_DIR/observerFile -x $PC_DIR/extensionsFile -b 20180101 -a 20280101 -N $RANDOM -k /HIRS/.ci/integration-tests/certs/ca.key -P /HIRS/.ci/integration-tests/certs/ca.crt --pem -f $PC_DIR/$platform_cert + /opt/paccor/bin/signer -o $PC_DIR/observerFile -x $PC_DIR/extensionsFile -b 20180101 -a 20280101 -N $RANDOM -k /HIRS/.ci/setup/certs/ca.key -P /HIRS/.ci/setup/certs/ca.crt --pem -f $PC_DIR/$platform_cert if tpm2_nvlist | grep -q 0x1c00002; then echo "Released NVRAM for EK." diff --git a/.ci/integration-tests/setup-tpmprovisioner.sh b/.ci/setup/setup-tpmprovisioner.sh similarity index 100% rename from .ci/integration-tests/setup-tpmprovisioner.sh rename to .ci/setup/setup-tpmprovisioner.sh diff --git a/.ci/system-tests/system_test.py b/.ci/system-tests/system_test.py index aeaa35ff..a0d39b80 100644 --- a/.ci/system-tests/system_test.py +++ b/.ci/system-tests/system_test.py @@ -49,8 +49,8 @@ HIRS_ATTESTATION_CA_PORTAL_URL = "https://" + \ "/HIRS_AttestationCAPortal/" TEST_LOG_FILE = os.environ.get('TEST_LOG') LOG_LEVEL = os.environ.get('LOG_LEVEL') -CA_CERT_LOCATION = "/HIRS/.ci/integration-tests/certs/ca.crt" -EK_CA_CERT_LOCATION = "/HIRS/.ci/integration-tests/certs/ek_cert.der" +CA_CERT_LOCATION = "/HIRS/.ci/setup/certs/ca.crt" +EK_CA_CERT_LOCATION = "/HIRS/.ci/setup/certs/ek_cert.der" USB_STORAGE_FILE_HASH = "e164c378ceb45a62642730be5eb3169a6bfc2d6d" USB_STORAGE_FILE_HASH_2 = "e164c378ceb45a62642730be5eb3169a6bfc1234" FORMAT = "%(asctime)-15s %(message)s"