Clean up CI (#102)

.vsts-ci-san-and-doc.yml

@@ -22,7 +22,10 @@ jobs:
       displayName: Sphinx
       workingDirectory: sphinx
 
-- job: ACC_SAN_build
+- job: ACC_1804_virtual_SAN_build
   pool: Ubuntu-1804-SGX-Azure
   steps:
-    - template: .vsts-ci-templates/build_and_test_with_san.yml
+    - template: .vsts-ci-templates/build_and_test.yml
+      parameters:
+        cmake_args: '-DVIRTUAL_ONLY=ON -DSAN=ON'
+        suite_name_suffix: ' Virtual SAN'

.vsts-ci-templates/build_and_test.yml

@@ -1,6 +1,7 @@
 parameters:
   cmake_args: ''
   suite_name_suffix: ''
+  ctest_filter: ''
 
 steps:
 - checkout: self
@@ -17,7 +18,7 @@ steps:
   workingDirectory: build
 
 - script: |
-    ./tests.sh -VV --timeout 240 --no-compress-output -T Test
+    ./tests.sh -VV --timeout 240 --no-compress-output -T Test ${{ parameters.ctest_filter }}
   displayName: CTest
   workingDirectory: build
 

.vsts-ci-templates/build_and_test_with_san.yml

@@ -1,45 +0,0 @@
-steps:
-- checkout: self
-  clean: true
-  submodules: true
-
-- task: CMake@1
-  displayName: CMake
-  inputs:
-    cmakeArgs: '-GNinja -DSAN=ON -DEXTENSIVE_TESTS=ON ..'
-
-- script: ninja
-  displayName: Ninja
-  workingDirectory: build
-
-- script: |
-    ./tests.sh -VV --timeout 240 --no-compress-output -T Test
-  displayName: CTest
-  workingDirectory: build
-
-- script: 'xsltproc --stringparam suiteName "$(Agent.MachineName)" ../tests/infra/ctest_to_junit.xslt Testing/*/Test.xml > JUnit_enclave.xml'
-  displayName: XSLT
-  workingDirectory: build
-  condition: succeededOrFailed()
-
-- script: |
-    TEST_ENCLAVE=virtual ./tests.sh -VV -R client_test --timeout 240 --no-compress-output -T Test
-  displayName: CTest
-  workingDirectory: build
-
-- script: 'xsltproc --stringparam suiteName "$(Agent.MachineName) Virtual" ../tests/infra/ctest_to_junit.xslt Testing/*/Test.xml > JUnit_virtual.xml'
-  displayName: XSLT
-  workingDirectory: build
-  condition: succeededOrFailed()
-
-- task: PublishTestResults@2
-  inputs:
-    testResultsFiles: '**/JUnit_*.xml'
-    publishRunAttachments: true
-  condition: succeededOrFailed()
-
-- script: |
-    ls *_test | xargs -n1 -I '{}' llvm-profdata-7 merge {}.profraw -o {}.profdata
-    ls *_test | xargs -n1 -I '{}' sh -c 'printf "\n*** Binary: {} ***\n "; llvm-cov-7 report -object {} -instr-profile {}.profdata -ignore-filename-regex="(boost|openenclave|3rdparty|/test/)"'
-  displayName: Coverage
-  workingDirectory: build

.vsts-ci-templates/push_perf_data.yml

@@ -1,10 +1,4 @@
 steps:
-- script: |
-    gzip -vk *_sent.csv *_recv.csv
-    gzip -vk *_metrics.json
-  displayName: Compress tx time metrics
-  workingDirectory: build
-
 - task: AzureCLI@1
   displayName: Push Performance Data
   inputs:
@@ -13,7 +7,4 @@ steps:
     scriptLocation: inlineScript
     inlineScript: |
       az storage blob upload -f perf_summary.csv -c perf -n $AGENT_NAME/${BUILD_SOURCEBRANCHNAME}_${BUILD_BUILDNUMBER}.csv --account-name ccfperf --subscription $(subscription)
-      az storage blob upload-batch -d tx-times/$AGENT_NAME/${BUILD_SOURCEBRANCHNAME}_${BUILD_BUILDNUMBER} -s. --pattern "*_sent.csv.gz" --account-name ccfperf --subscription $(subscription)
-      az storage blob upload-batch -d tx-times/$AGENT_NAME/${BUILD_SOURCEBRANCHNAME}_${BUILD_BUILDNUMBER} -s. --pattern "*_recv.csv.gz" --account-name ccfperf --subscription $(subscription)
-      az storage blob upload-batch -d metrics/$AGENT_NAME/${BUILD_SOURCEBRANCHNAME}_${BUILD_BUILDNUMBER} -s. --pattern "*_metrics.json.gz" --account-name ccfperf --subscription $(subscription)
     workingDirectory: build

.vsts-ci.yml

@@ -8,7 +8,8 @@ jobs:
   pool: Ubuntu-1804-SGX-Azure
   steps:
     - template: .vsts-ci-templates/build_and_test.yml
-    - template: .vsts-ci-templates/push_perf_data.yml
+      parameters:
+        cmake_args: '-DBUILD_SMALLBANK=OFF'
 
 - job: ACC_1804_virtual_build
   pool: Ubuntu-1804-SGX-Azure
@@ -19,6 +20,16 @@ jobs:
         suite_name_suffix: ' Virtual Coverage'
     - template: .vsts-ci-templates/coverage.yml
 
+- job: ACC_1804_perf_build
+  pool: Ubuntu-1804-SGX-Azure
+  steps:
+    - template: .vsts-ci-templates/build_and_test.yml
+      parameters:
+        cmake_args: '-DBUILD_SMALLBANK=ON -DCURVE_CHOICE=secp256k1_bitcoin'
+        suite_name_suffix: ' Performance'
+        ctest_filter: '-R small_bank'
+    - template: .vsts-ci-templates/push_perf_data.yml
+
 - job: static_checks
   pool: Ubuntu-1804-SGX-Azure
   steps:

CMakeLists.txt

@@ -45,8 +45,6 @@ endif()
 
 option(BUILD_SMALLBANK "Build SmallBank sample app and clients" ON)
 
-option(END_TO_END_COVERAGE "Run additional tests in virtual enclaves to generate coverage for end to end tests" OFF)
-
 # MemberClient executable
 add_executable(memberclient src/clients/memberclient.cpp)
 use_client_mbedtls(memberclient)
@@ -321,23 +319,11 @@ if(BUILD_TESTS)
       ${RECOVERY_ARGS}
   )
 
-  if(BUILD_SMALLBANK)
+  if (BUILD_SMALLBANK)
     include(${CMAKE_CURRENT_SOURCE_DIR}/samples/apps/smallbank/smallbank.cmake)
   endif()
 
   if (EXTENSIVE_TESTS)
     set_tests_properties(recovery_tests PROPERTIES TIMEOUT 2000)
   endif()
-
-  if(END_TO_END_COVERAGE)
-    add_test(
-      NAME end_to_end_logging_coverage
-      COMMAND
-        ${PYTHON} ${CMAKE_SOURCE_DIR}/tests/e2e_logging.py
-        -b .
-        ${TEST_FORWARD_TO_LEADER}
-        ${CCF_NETWORK_TEST_COV_ARGS}
-    )
-  endif()
-
 endif()

cmake/common.cmake

@@ -544,13 +544,6 @@ set(CCF_NETWORK_TEST_ARGS
   -g ${CCF_DIR}/src/runtime_config/gov.lua
 )
 
-set(CCF_NETWORK_TEST_COV_ARGS
-  ${TEST_EXPECT_QUOTE}
-  -e virtual
-  -l ${TEST_HOST_LOGGING_LEVEL}
-  -g ${CCF_DIR}/src/runtime_config/gov.lua
-)
-
 # Lua generic app
 add_enclave_lib(luagenericenc ${CCF_DIR}/src/apps/luageneric/oe_sign.conf ${CCF_DIR}/src/apps/sample_key.pem SRCS ${CCF_DIR}/src/apps/luageneric/luageneric.cpp)
 

samples/apps/smallbank/smallbank.cmake

@@ -26,7 +26,7 @@ if(BUILD_TESTS)
   )
 
   add_perf_test(
-    NAME small_bank_client_sigs_test
+    NAME small_bank_sigs_client_test
     PYTHON_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/tests/small_bank_client.py
     CLIENT_BIN ./small_bank_client
     VERIFICATION_FILE ${CMAKE_CURRENT_LIST_DIR}/tests/verify_small_bank_short.json