Fix mixed tabs and trailing blanks in Jenkinsfiles

This commit is contained in:
Michał Kowalczyk
2018-11-30 03:05:22 +01:00
parent 137b2c5ee1
commit ce43853139
3 changed files with 63 additions and 63 deletions
+9 -9
View File
@@ -1,7 +1,7 @@
pipeline {
agent {
agent {
dockerfile { filename 'Jenkinsfiles/ubuntu-16.04.dockerfile' }
}
}
stages {
stage('Build') {
steps {
@@ -33,30 +33,30 @@ pipeline {
cd LibOS/shim/test/apps/bash
make regression
'''
timeout(time: 5, unit: 'MINUTES') {
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/apps/gcc
make regression
'''
}
timeout(time: 15, unit: 'MINUTES') {
}
timeout(time: 15, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/apps/lmbench
make regression
'''
}
}
sh '''
cd LibOS/shim/test/apps/lighttpd
make
make start-graphene-server &
sleep 1
./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
sleep 1
./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
'''
sh '''
cd LibOS/shim/test/apps/apache
make
make start-graphene-server &
sleep 1
sleep 1
./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
'''
}
+7 -7
View File
@@ -1,7 +1,7 @@
pipeline {
agent {
agent {
dockerfile { filename 'Jenkinsfiles/ubuntu-16.04.dockerfile' }
}
}
stages {
stage('Build') {
steps {
@@ -33,23 +33,23 @@ pipeline {
cd LibOS/shim/test/apps/bash
make regression
'''
timeout(time: 5, unit: 'MINUTES') {
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/apps/gcc
make regression
'''
}
timeout(time: 20, unit: 'MINUTES') {
}
timeout(time: 20, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/apps/lmbench
make regression
'''
}
}
sh '''
cd LibOS/shim/test/apps/lighttpd
make
make start-graphene-server &
sleep 1
sleep 1
./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
'''
}
+47 -47
View File
@@ -1,9 +1,9 @@
pipeline {
agent {
dockerfile { filename 'Jenkinsfiles/ubuntu-16.04.dockerfile'
label 'sgx_slave'
args "-v /lib/modules:/lib/modules:ro -v /usr/src:/usr/src:ro -v /var/run/aesmd/aesm.socket:/var/run/aesmd/aesm.socket --device=/dev/gsgx:/dev/gsgx --device=/dev/isgx:/dev/isgx"
}
label 'sgx_slave'
args "-v /lib/modules:/lib/modules:ro -v /usr/src:/usr/src:ro -v /var/run/aesmd/aesm.socket:/var/run/aesmd/aesm.socket --device=/dev/gsgx:/dev/gsgx --device=/dev/isgx:/dev/isgx"
}
}
stages {
stage('Build') {
@@ -12,49 +12,49 @@ pipeline {
cd Pal/src/host/Linux-SGX/signer/ && openssl genrsa -3 -out enclave-key.pem 3072
'''
sh '''
cd /opt/intel
git clone https://github.com/01org/linux-sgx-driver.git
cd linux-sgx-driver
git checkout sgx_driver_1.9
make
'''
sh '''
cd Pal/src/host/Linux-SGX/sgx-driver
ISGX_DRIVER_PATH=/opt/intel/linux-sgx-driver ISGX_DRIVER_VERSION=1.9 make
cd /opt/intel
git clone https://github.com/01org/linux-sgx-driver.git
cd linux-sgx-driver
git checkout sgx_driver_1.9
make
'''
sh '''
make SGX=1
sh '''
cd Pal/src/host/Linux-SGX/sgx-driver
ISGX_DRIVER_PATH=/opt/intel/linux-sgx-driver ISGX_DRIVER_VERSION=1.9 make
'''
sh '''
make SGX=1
'''
sh '''
make SGX_RUN=1
'''
sh '''
make SGX_RUN=1
'''
}
}
stage('Test') {
steps {
/*
timeout(time: 15, unit: 'MINUTES') {
/*
timeout(time: 15, unit: 'MINUTES') {
sh '''
cd Pal/regression
make SGX=1
make SGX_RUN=1
make SGX=1
make SGX_RUN=1
make SGX_RUN=1 KEEP_LOG=1 regression
'''
}
*/
timeout(time: 5, unit: 'MINUTES') {
}
*/
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/regression
make SGX=1
make SGX_RUN=1
make SGX=1
make SGX_RUN=1
make SGX_RUN=1 regression
'''
}
timeout(time: 5, unit: 'MINUTES') {
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/apps/python
make SGX=1
make SGX_RUN=1
make SGX=1
make SGX_RUN=1
make SGX_RUN=1 regression
'''
}
@@ -66,39 +66,39 @@ pipeline {
make SGX_RUN=1 regression
'''
}
timeout(time: 5, unit: 'MINUTES') {
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/apps/gcc
make SGX=1
make SGX_RUN=1
make SGX=1
make SGX_RUN=1
make SGX_RUN=1 regression
'''
}
timeout(time: 15, unit: 'MINUTES') {
}
timeout(time: 15, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/apps/lmbench
make SGX=1
make SGX_RUN=1
make SGX=1
make SGX_RUN=1
make SGX_RUN=1 regression
'''
}
}
sh '''
cd LibOS/shim/test/apps/lighttpd
make SGX=1
make SGX_RUN=1
make SGX=1
make SGX_RUN=1
make SGX_RUN=1 start-graphene-server &
sleep 10
./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
sleep 10
./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
'''
/*
/*
sh '''
cd LibOS/shim/test/apps/apache
make SGX=1
make SGX_RUN=1
make SGX=1
make SGX_RUN=1
make SGX_RUN=1 start-graphene-server &
sleep 15 && ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
sleep 15 && ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
'''
*/
*/
}
}
stage('Deploy') {