Skip to content

Commit

Permalink
[CI-Examples] Rename Examples/ to CI-Examples/
Browse files Browse the repository at this point in the history
Previous commit removed big/unused examples from this repo. Now we only
keep examples that are run in our Jenkins CI, so we rename the directory
to reflect this.

Signed-off-by: Dmitrii Kuvaiskii <dmitrii.kuvaiskii@intel.com>
  • Loading branch information
dimakuv authored and mkow committed Sep 6, 2021
1 parent 2d06f6f commit 4321ecf
Show file tree
Hide file tree
Showing 90 changed files with 43 additions and 42 deletions.
20 changes: 10 additions & 10 deletions .ci/lib/stage-clean-check.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ stage('clean-check') {

make -C LibOS/shim/test/regression clean

make -C Examples/python clean
make -C Examples/bash clean
make -C Examples/memcached distclean
make -C Examples/redis distclean
make -C Examples/lighttpd distclean
make -C Examples/nginx distclean
make -C Examples/blender distclean
make -C Examples/sqlite distclean
make -C CI-Examples/python clean
make -C CI-Examples/bash clean
make -C CI-Examples/memcached distclean
make -C CI-Examples/redis distclean
make -C CI-Examples/lighttpd distclean
make -C CI-Examples/nginx distclean
make -C CI-Examples/blender distclean
make -C CI-Examples/sqlite distclean
make -C Pal/src PAL_HOST=Skeleton clean

make -C Examples/ra-tls-mbedtls distclean
make -C Examples/ra-tls-secret-prov distclean
make -C CI-Examples/ra-tls-mbedtls distclean
make -C CI-Examples/ra-tls-secret-prov distclean

make -C LibOS/shim/test/ltp clean
# LTP's make clean is broken, see https://github.com/linux-test-project/ltp/issues/559
Expand Down
16 changes: 8 additions & 8 deletions .ci/lib/stage-test-direct.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ stage('test-direct') {
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/python
cd CI-Examples/python
make ${MAKEOPTS} all
make check
'''
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/bash
cd CI-Examples/bash
make ${MAKEOPTS} all
make ${MAKEOPTS} regression
'''
}
timeout(time: 10, unit: 'MINUTES') {
sh '''
cd Examples/memcached
cd CI-Examples/memcached
make -j8 all
make start-graphene-server &
../../Scripts/wait_for_server 5 127.0.0.1 11211
Expand All @@ -39,7 +39,7 @@ stage('test-direct') {
}
timeout(time: 10, unit: 'MINUTES') {
sh '''
cd Examples/redis
cd CI-Examples/redis
if .ci/isdistro xenial
then
USE_SELECT=1
Expand All @@ -53,7 +53,7 @@ stage('test-direct') {
}
timeout(time: 10, unit: 'MINUTES') {
sh '''
cd Examples/lighttpd
cd CI-Examples/lighttpd
make -j8 all
make start-graphene-server &
../../Scripts/wait_for_server 5 127.0.0.1 8003
Expand All @@ -62,7 +62,7 @@ stage('test-direct') {
}
timeout(time: 10, unit: 'MINUTES') {
sh '''
cd Examples/nginx
cd CI-Examples/nginx
make -j8 all
make start-graphene-server &
../../Scripts/wait_for_server 5 127.0.0.1 8002
Expand All @@ -71,14 +71,14 @@ stage('test-direct') {
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/blender
cd CI-Examples/blender
make ${MAKEOPTS} all
make check
'''
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/sqlite
cd CI-Examples/sqlite
make ${MAKEOPTS} all
make ${MAKEOPTS} regression
'''
Expand Down
20 changes: 10 additions & 10 deletions .ci/lib/stage-test-sgx.jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
stage('test-sgx') {
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/python
cd CI-Examples/python
make ${MAKEOPTS}
make ${MAKEOPTS} check
'''
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/bash
cd CI-Examples/bash
make ${MAKEOPTS}
make ${MAKEOPTS} regression
'''
}
timeout(time: 15, unit: 'MINUTES') {
sh '''
cd Examples/memcached
cd CI-Examples/memcached
make ${MAKEOPTS}
make SGX=1 start-graphene-server &
../../Scripts/wait_for_server 60 127.0.0.1 11211
Expand All @@ -35,7 +35,7 @@ stage('test-sgx') {
export USE_SELECT
fi

cd Examples/redis
cd CI-Examples/redis
make ${MAKEOPTS}
make ${MAKEOPTS} start-graphene-server &
../../Scripts/wait_for_server 60 127.0.0.1 6379
Expand All @@ -44,7 +44,7 @@ stage('test-sgx') {
}
timeout(time: 15, unit: 'MINUTES') {
sh '''
cd Examples/lighttpd
cd CI-Examples/lighttpd
make ${MAKEOPTS}
make ${MAKEOPTS} start-graphene-server &
../../Scripts/wait_for_server 60 127.0.0.1 8003
Expand All @@ -53,7 +53,7 @@ stage('test-sgx') {
}
timeout(time: 15, unit: 'MINUTES') {
sh '''
cd Examples/nginx
cd CI-Examples/nginx
make ${MAKEOPTS}
make ${MAKEOPTS} start-graphene-server &
../../Scripts/wait_for_server 60 127.0.0.1 8002
Expand All @@ -62,21 +62,21 @@ stage('test-sgx') {
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/blender
cd CI-Examples/blender
make ${MAKEOPTS}
make ${MAKEOPTS} check
'''
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/sqlite
cd CI-Examples/sqlite
make ${MAKEOPTS} all
make ${MAKEOPTS} regression
'''
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/ra-tls-mbedtls
cd CI-Examples/ra-tls-mbedtls
if [ "${ra_client_spid}" != "" ] && [ "${ra_client_key}" != "" ]; \
then \
make check_epid RA_CLIENT_SPID=${ra_client_spid} \
Expand All @@ -93,7 +93,7 @@ stage('test-sgx') {
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/ra-tls-secret-prov
cd CI-Examples/ra-tls-secret-prov
if [ "${ra_client_spid}" != "" ] && [ "${ra_client_key}" != "" ]; \
then \
make SGX=1 check_epid RA_CLIENT_SPID=${ra_client_spid} \
Expand Down
6 changes: 3 additions & 3 deletions .ci/run-shellcheck
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ set -e
cd "$(git rev-parse --show-toplevel)"

LC_ALL=C.UTF-8 shellcheck "$@" \
Examples/bash/scripts/bash_test.sh \
Examples/common_tools/benchmark-http.sh \
Examples/python/run-tests.sh \
CI-Examples/bash/scripts/bash_test.sh \
CI-Examples/common_tools/benchmark-http.sh \
CI-Examples/python/run-tests.sh \
Runtime/pal_loader \
Scripts/clean-check \
Scripts/clean-check-prepare \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions Documentation/attestation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ RA-TLS is shipped as three libraries: ``ra_tls_attest.so``, EPID based
The interfaces exposed by these libraries can be found in the following header:
:file:`Pal/src/host/Linux-SGX/tools/ra-tls/ra_tls.h`.

The examples of using RA-TLS can be found under ``Examples/ra-tls-mbedtls``.
The examples of using RA-TLS can be found under ``CI-Examples/ra-tls-mbedtls``.

``ra_tls_attest.so``
^^^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -372,7 +372,7 @@ Secret Provisioning is shipped as three libraries: ``secret_prov_attest.so``,
EPID based ``secret_prov_verify_epid.so`` and DCAP/ECDSA based
``secret_prov_verify_dcap.so``.

The examples of using RA-TLS can be found under ``Examples/ra-tls-secret-prov``.
The examples of using RA-TLS can be found under ``CI-Examples/ra-tls-secret-prov``.
The examples include minimalistic provisioning of constant-string secrets as
well as provisioning of an encryption key and its later use for protected files.

Expand Down
8 changes: 4 additions & 4 deletions Documentation/devel/performance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,13 @@ Here is an example:
::

# exitless disabled: `sgx.thread_num = 8` and `sgx.rpc_thread_num = 0`
Examples/redis$ graphene-sgx redis-server --save '' --protected-mode no &
Examples/redis$ src/src/redis-benchmark -t set
CI-Examples/redis$ graphene-sgx redis-server --save '' --protected-mode no &
CI-Examples/redis$ src/src/redis-benchmark -t set
43010.75 requests per second

# exitless enabled: `sgx.thread_num = 8` and `sgx.rpc_thread_num = 8`
Examples/redis$ graphene-sgx redis-server --save '' --protected-mode no &
Examples/redis$ src/src/redis-benchmark -t set
CI-Examples/redis$ graphene-sgx redis-server --save '' --protected-mode no &
CI-Examples/redis$ src/src/redis-benchmark -t set
68119.89 requests per second

As you can see, enabling the Exitless feature improves performance of Redis by
Expand Down
11 changes: 6 additions & 5 deletions Documentation/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Quick start without SGX support
make
graphene-direct helloworld

#. For more complex examples, see :file:`Examples` directory.
#. For more complex examples, see :file:`CI-Examples` directory.

Quick start with SGX support
-------------------------------
Expand Down Expand Up @@ -98,10 +98,11 @@ Running sample applications
---------------------------

We prepared and tested several applications to demonstrate Graphene and
Graphene-SGX usability. These applications can be found in the :file:`Examples`
folder in the repository, each containing a short README with instructions how
to test it. We recommend starting with a simpler, thoroughly documented example
of Redis, to understand manifest options and features of Graphene.
Graphene-SGX usability. These applications can be found in the
:file:`CI-Examples` folder in the repository, each containing a short README
with instructions how to test it. We recommend starting with a simpler,
thoroughly documented example of Redis, to understand manifest options and
features of Graphene.

Please note that these sample applications are tested on Ubuntu 18.04 and 20.04.
Most of these applications are also known to run correctly on
Expand Down

0 comments on commit 4321ecf

Please sign in to comment.