Test jenkins

BUILD.md

@@ -42,7 +42,7 @@ Follow the instructions below to execute a Docker-based build and execution.
 3. Open a Docker container shell using following command
    `sudo docker exec -it tcf bash`
 4. Activate a virtual environment in the Docker shell using following command
-   from the Docker working directory, `$TCF_HOME/__tools__/build`,
+   from the Docker working directory, `$TCF_HOME/tools/build`,
    which is set in the `docker-compose.yaml` file:
    ```
    source _dev/bin/activate
@@ -75,7 +75,7 @@ export TCF_HOME=`pwd`
 
 Change to the quickstart build directory:
 ```
-cd $TCF_HOME/__tools__/build
+cd $TCF_HOME/tools/build
 ```
 
 Check that these variables are set before building the code:

Jenkinsfile

@@ -0,0 +1,99 @@
+#!groovy
+
+// Copyright 2019 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ------------------------------------------------------------------------------
+
+pipeline {
+    agent {
+        node {
+            label 'master'
+            customWorkspace "workspace/${env.BUILD_TAG}"
+        }
+    }
+
+    options {
+        timestamps()
+        buildDiscarder(logRotator(daysToKeepStr: '31'))
+    }
+
+    stages {
+        stage('Check for Signed-Off Commits') {
+            steps {
+                sh '''#!/bin/bash -l
+                    if [ -v CHANGE_URL ] ;
+                    then
+                        temp_url="$(echo $CHANGE_URL |sed s#github.com/#api.github.com/repos/#)/commits"
+                        pull_url="$(echo $temp_url |sed s#pull#pulls#)"
+
+                        IFS=$'\n'
+                        for m in $(curl -s "$pull_url" | grep "message") ; do
+                            if echo "$m" | grep -qi signed-off-by:
+                            then
+                              continue
+                            else
+                              echo "FAIL: Missing Signed-Off Field"
+                              echo "$m"
+                              exit 1
+                            fi
+                        done
+                        unset IFS;
+                    fi
+                '''
+            }
+        }
+
+        stage('Build TCF') {
+            steps {
+                sh 'docker-compose -f ci/docker-compose-build.yaml up'
+                sh 'docker-compose -f ci/docker-compose-build.yaml down'
+            }
+        }
+
+        stage('Run TCF Tests') {
+            steps {
+                sh 'docker-compose -f ci/docker-compose-tests.yaml up'
+                sh 'docker-compose -f ci/docker-compose-tests.yaml down'
+            }
+        }
+
+        stage('Create git archive') {
+            steps {
+                sh '''
+                    REPO=$(git remote show -n origin | grep Fetch | awk -F'[/.]' '{print $6}')
+                    git archive HEAD --format=zip -9 --output=$REPO.zip
+                    git archive HEAD --format=tgz -9 --output=$REPO.tgz
+                '''
+            }
+        }
+
+    }
+
+    post {
+        always {
+            sh 'docker-compose -f ci/docker-compose-build.yaml down'
+            sh 'docker-compose -f ci/docker-compose-tests.yaml down'
+        }
+        success {
+            archiveArtifacts '*.tgz, *.zip'
+        }
+        aborted {
+            error "Aborted, exiting now"
+        }
+        failure {
+            error "Failed, exiting now"
+        }
+    }
+}
+

ci/docker-compose-build.yaml

@@ -0,0 +1,36 @@
+# Copyright 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version: '3.5'
+
+services:
+  tcf:
+    container_name: tcf
+    image: tcf-ci-build
+
+    build:
+      context: .
+      dockerfile: ../docker/Dockerfile.tcf-dev
+      args:
+        - http_proxy
+        - https_proxy
+        - no_proxy
+    volumes:
+      - ../:/project/TrustedComputeFramework
+    working_dir: "/project/TrustedComputeFramework/tools/build"
+    entrypoint: "bash -c \"\
+        if [ ${MAKECLEAN:-1} != 0 ]; then echo \\\"Clean build\\\" && make clean; fi \
+        && make \
+        && echo \\\"BUILD SUCCESS\\\" \""
+    stop_signal: SIGKILL

ci/docker-compose-tests.yaml

@@ -0,0 +1,36 @@
+# Copyright 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version: '3.5'
+
+services:
+  tcf:
+    container_name: tcf
+    image: tcf-ci-build
+    build:
+      context: .
+      args:
+        - http_proxy
+        - https_proxy
+        - no_proxy
+    volumes:
+      - ../:/project/TrustedComputeFramework
+    working_dir: "/project/TrustedComputeFramework/tools/build"
+    entrypoint: "bash -c \"\
+        source _dev/bin/activate \
+        && cd ../../scripts \
+        && source tcs_startup.sh -y \
+        && sleep 5 \
+        && source ../tools/run_tests.sh \""
+    stop_signal: SIGKILL

workloads/CMakeLists.txt → common/sgx_workload/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright 2018 Intel Corporation
+# Copyright 2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,10 +22,11 @@ INCLUDE(CMakeVariables.txt)
 FILE(GLOB PROJECT_HEADERS *.h)
 FILE(GLOB PROJECT_SOURCES *.cpp)
 
-SET(GENERIC_PRIVATE_INCLUDE_DIRS "." "${TCF_TOP_DIR}/tcs/core/common" "${TCF_TOP_DIR}/tcs/core/common/work_order_interface" "${TCF_TOP_DIR}/tcs/core/common/crypto" )
+SET(GENERIC_PRIVATE_INCLUDE_DIRS "." "${TCF_TOP_DIR}/tc/sgx/common" 
+ "${TCF_TOP_DIR}/tc/sgx/common/work_order_interface" "${TCF_TOP_DIR}/examples/apps")
 SET(GENERIC_CXX_FLAGS ${DEBUG_FLAGS} "-Wall" "-fPIC" "-Wno-write-strings" "-std=c++11")
 
-SET(WORKLOAD_STATIC_NAME workloads)
+SET(WORKLOAD_STATIC_NAME sgx_workload)
 PROJECT(${WORKLOAD_STATIC_NAME} CXX)
 
 ADD_LIBRARY(${WORKLOAD_STATIC_NAME} STATIC ${PROJECT_HEADERS} ${PROJECT_SOURCES})
@@ -35,8 +36,6 @@ TARGET_INCLUDE_DIRECTORIES(${WORKLOAD_STATIC_NAME} PRIVATE "..")
 TARGET_INCLUDE_DIRECTORIES(${WORKLOAD_STATIC_NAME} PUBLIC ${GENERIC_PUBLIC_INCLUDE_DIRS})
 TARGET_INCLUDE_DIRECTORIES(${WORKLOAD_STATIC_NAME} PUBLIC "${SGX_SDK}/include/tlibc")
 TARGET_INCLUDE_DIRECTORIES(${WORKLOAD_STATIC_NAME} PUBLIC "${SGX_SDK}/include/libcxx")
-TARGET_INCLUDE_DIRECTORIES(${WORKLOAD_STATIC_NAME} PUBLIC "${SGX_SSL}/include")
-TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PRIVATE ${TCF_TOP_DIR}/tcs/core/common/packages/parson)
 
 TARGET_COMPILE_OPTIONS(${WORKLOAD_STATIC_NAME} PRIVATE "${GENERIC_CXX_FLAGS}")
 TARGET_COMPILE_OPTIONS(${WORKLOAD_STATIC_NAME} PRIVATE "-nostdinc")
@@ -46,6 +45,4 @@ TARGET_COMPILE_OPTIONS(${WORKLOAD_STATIC_NAME} PRIVATE "-fno-builtin-printf")
 TARGET_COMPILE_DEFINITIONS(${WORKLOAD_STATIC_NAME} PRIVATE "-DUSE_DL=1")
 
 ################################################################################
-ADD_SUBDIRECTORY(echo_work_order)
-ADD_SUBDIRECTORY(heart_disease_eval)
 

common/sgx_workload/CMakeVariables.txt

@@ -0,0 +1,35 @@
+# Copyright 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+################################################################################
+# Configure Environment
+################################################################################
+
+SET(TCF_TOP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
+
+if("$ENV{DEBUG} " STREQUAL " ")
+    SET(DEBUG_FLAGS "-O2")
+    message(STATUS "Compiling with optimizations (-O2). To use debug flags, set the DEBUG environment variable.")
+else()
+    SET(DEBUG_FLAGS "-Og" "-g" "-DDEBUG")
+    message(STATUS "Compiling in debug mode without optimizations (-Og -g)")
+endif()
+
+SET(SGX_SDK "$ENV{SGX_SDK}")
+if("${SGX_SDK} " STREQUAL " ")
+    message(FATAL_ERROR "SGX_SDK environment variable not defined!")
+endif()
+
+SET(GENERIC_PUBLIC_INCLUDE_DIRS "${SGX_SDK}/include")