Skip to content

Commit

Permalink
testing: update integration tests runscript
Browse files Browse the repository at this point in the history
Updated the script which triggers the integration
tests, in order to use the latest CLI package interface
(resource allocation service + updated file paths).
Also documented the update in the SPEC file changelog.

Signed-off-by: Gabriel Bercaru <[email protected]>
  • Loading branch information
bercarug committed Oct 25, 2020
1 parent b09597f commit 6854304
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
5 changes: 4 additions & 1 deletion SPECS/aws-nitro-enclaves-cli.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Summary: AWS Nitro Enclaves tools for managing enclaves
Name: aws-nitro-enclaves-cli
Version: 1.0
Release: 4%{?dist}
Release: 5%{?dist}

License: Apache 2.0

Expand Down Expand Up @@ -159,6 +159,9 @@ rm -rf %{ne_log_dir}
%{ne_include_dir}/*

%changelog
* Sun Oct 25 2020 Gabriel Bercaru <[email protected]> - 1.0-5
- Refactored integration tests main scripts in order to use the allocator service

* Tue Oct 20 2020 Dan Horobeanu <[email protected]> - 1.0-4
- Removed dependency on `nitro_enclaves.device` for the allocator service
- Removed timeout from the allocator oneshot service
Expand Down
8 changes: 4 additions & 4 deletions run-nitro-cli-integration-tests
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# Install required packages
echo "===== Installing required packages ====="
sudo pip3 install -U pytest > /dev/null 2>&1
sudo yum install -y kernel-headers-$(uname -r) kernel-devel-$(uname -r) > /dev/null 2>&1

# Configure enclaves environment
echo "===== Configuring enclaves environment ====="
PREV_DIR=$(pwd) && cd /usr/share/nitro_enclaves/drivers/virt/nitro_enclaves && sudo make > /dev/null 2>&1 && cd $PREV_DIR
nitro-cli-config -s -d /usr/share/nitro_enclaves -i

nitro-cli-config -m 2048 -t 2
TESTS_MEM=2046

sudo sed -Ei "s/^memory_mib:.+\$/memory_mib: $TESTS_MEM/" /etc/nitro_enclaves/allocator.yaml
sudo systemctl restart nitro-enclaves-allocator.service

# Run integration tests
echo "===== Running integration tests except for the installation test ====="
Expand Down

0 comments on commit 6854304

Please sign in to comment.