pipeline changes (#6920)

.buildkite/coverage.yml

@@ -1,17 +1,16 @@
 steps:
-  - command: |
+  - label: ":spiral_note_pad: Generate Report"
+    command: |
+        echo "--- :hammer: Ensuring lcov is installed" && apt-get install -y lcov && \
         echo "--- :hammer: Building" && \
-        /usr/bin/cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++-4.0 -DCMAKE_C_COMPILER=clang-4.0 -DBOOST_ROOT="${BOOST_ROOT}" -DWASM_ROOT="${WASM_ROOT}" -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBUILD_MONGO_DB_PLUGIN=true -DENABLE_COVERAGE_TESTING=true -DBUILD_DOXYGEN=false && \
-        /usr/bin/ninja
+        cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++-4.0 -DCMAKE_C_COMPILER=clang-4.0 -DBOOST_ROOT="${BOOST_ROOT}" -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBUILD_MONGO_DB_PLUGIN=true -DENABLE_COVERAGE_TESTING=true -DBUILD_DOXYGEN=false && \
+        ninja && \
         echo "--- :spiral_note_pad: Generating Code Coverage Report" && \
-        /usr/bin/ninja EOSIO_ut_coverage && \
+        ninja EOSIO_ut_coverage && \
         echo "--- :arrow_up: Publishing Code Coverage Report" && \
         buildkite-agent artifact upload "EOSIO_ut_coverage/**/*" s3://eos-coverage/$BUILDKITE_JOB_ID && \
-        cp /config/.coveralls.yml . && \
-        /usr/local/bin/coveralls-lcov EOSIO_ut_coverage_filtered.info && \
         echo "+++ View Report" && \
         printf "\033]1339;url=https://eos-coverage.s3-us-west-2.amazonaws.com/$BUILDKITE_JOB_ID/EOSIO_ut_coverage/index.html;content=View Full Coverage Report\a\n"
-    label: ":spiral_note_pad: Generate Report"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -20,16 +19,13 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.0.1:
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
         workdir: /data/job
-        mounts:
-          - /etc/buildkite-agent/config:/config
         environment:
+          - LCOV_PATH=/usr/bin/lcov
           - BOOST_ROOT=/root/opt/boost
           - OPENSSL_ROOT_DIR=/usr/include/openssl
-          - WASM_ROOT=/root/opt/wasm
-          - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/opt/wasm/bin
-          - CI=true
+          - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/opt/mongodb/bin:~/opt/llvm/bin/
     timeout: 60

CMakeLists.txt

@@ -192,7 +192,7 @@ set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build EOSIO for code coverage anal
 
 if(ENABLE_COVERAGE_TESTING)
   SET(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}")
-  find_program( LCOV_PATH  lcov )
+  find_program( LCOV_PATH lcov )
   find_program( LLVMCOV_PATH  llvm-cov )
   find_program( GENHTML_PATH NAMES genhtml)
 endif()

tests/CMakeLists.txt

@@ -117,7 +117,7 @@ if(ENABLE_COVERAGE_TESTING)
 
   if(NOT LLVMCOV_PATH)
     message(FATAL_ERROR "llvm-cov not found! Aborting...")
-  endif() # NOT LCOV_PATH
+  endif()
 
   if(NOT GENHTML_PATH)
     message(FATAL_ERROR "genhtml not found! Aborting...")