[CI] Change default SGX driver to upstream

Signed-off-by: Wojtek Porczyk <[email protected]>
gramineproject · Jun 25, 2024 · 12e5d9a · 12e5d9a
1 parent ca6ef92
commit 12e5d9a
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 4 deletions.
diff --git a/.ci/lib/stage-build-sgx.jenkinsfile b/.ci/lib/stage-build-sgx.jenkinsfile
@@ -16,7 +16,7 @@ stage('build') {
     }
 
     if (env.SGX_DRIVER == null) {
-        env.SGX_DRIVER = 'oot'
+        env.SGX_DRIVER = 'upstream'
     }
     if (env.SGX_DRIVER == 'oot') {
         sh '''

diff --git a/.ci/linux-sgx-edmm.jenkinsfile b/.ci/linux-sgx-edmm.jenkinsfile
@@ -3,7 +3,6 @@ node('sgx-edmm && aesni') {
 
     env.AVX = '1'  // EDMM-capable machines in our CI always have AVX
     env.SGX = '1'
-    env.SGX_DRIVER = 'upstream'
     env.EDMM = '1'
     env.RA_TYPE = 'dcap'
 

diff --git a/.ci/linux-sgx-sanitizers.jenkinsfile b/.ci/linux-sgx-sanitizers.jenkinsfile
@@ -2,6 +2,7 @@ node('sgx_slave_2.6 && aesni') {
     checkout scm
 
     env.SGX = '1'
+    env.SGX_DRIVER = 'oot'
 
     load '.ci/lib/config-docker.jenkinsfile'
     docker.build(

diff --git a/.ci/linux-sgx-ubuntu20.04-gcc-release-apps.jenkinsfile b/.ci/linux-sgx-ubuntu20.04-gcc-release-apps.jenkinsfile
@@ -2,6 +2,7 @@ node('sgx_slave_2.6 && aesni') {
     checkout scm
 
     env.SGX = '1'
+    env.SGX_DRIVER = 'oot'
 
     load '.ci/lib/config-docker.jenkinsfile'
     docker.build(

diff --git a/.ci/linux-sgx-ubuntu20.04-gcc-release.jenkinsfile b/.ci/linux-sgx-ubuntu20.04-gcc-release.jenkinsfile
@@ -2,6 +2,7 @@ node('sgx_slave_2.6 && aesni') {
     checkout scm
 
     env.SGX = '1'
+    env.SGX_DRIVER = 'oot'
 
     load '.ci/lib/config-docker.jenkinsfile'
     docker.build(

diff --git a/.ci/linux-sgx-ubuntu20.04-musl.jenkinsfile b/.ci/linux-sgx-ubuntu20.04-musl.jenkinsfile
@@ -2,6 +2,7 @@ node('sgx_slave_2.6 && aesni') {
     checkout scm
 
     env.SGX = '1'
+    env.SGX_DRIVER = 'oot'
     env.GRAMINE_MUSL = '1'
 
     load '.ci/lib/config-docker.jenkinsfile'

diff --git a/.ci/linux-sgx-ubuntu22.04-gcc-release.jenkinsfile b/.ci/linux-sgx-ubuntu22.04-gcc-release.jenkinsfile
@@ -2,7 +2,6 @@ node('sgx') {
     checkout scm
 
     env.SGX = '1'
-    env.SGX_DRIVER = 'upstream'
 
     load '.ci/lib/config-docker.jenkinsfile'
     docker.build(

diff --git a/.ci/linux-sgx-ubuntu24.04-gcc-release.jenkinsfile b/.ci/linux-sgx-ubuntu24.04-gcc-release.jenkinsfile
@@ -2,7 +2,6 @@ node('sgx') {
     checkout scm
 
     env.SGX = '1'
-    env.SGX_DRIVER = 'upstream'
 
     load '.ci/lib/config-docker.jenkinsfile'
     docker.build(