Local CI Fixes

This commit contain fixes for following 1. Remove Pytorch additional setup 2. Enable tcp_ipv6_v6only across all distros 3. Add must-pass for ppoll test cases
anjalirai-intel · Jun 12, 2023 · 276842f · 276842f
1 parent 282f14a
commit 276842f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/ci/config/config-centos8.jenkinsfile b/ci/config/config-centos8.jenkinsfile
@@ -7,7 +7,3 @@ env.JAVAHOME = sh(script: "java -XshowSettings:properties -version 2>&1 > /dev/n
 
 // Environment for bazel workload
 env.PYTHON_BIN_PATH = sh(script: 'which python3', returnStdout: true).trim()
-
-// Environment for pytorch workload
-env.SETUPTOOLS_PATH = sh(script: 'pip3 show setuptools | grep Location: | cut -d" " -f2', returnStdout: true).trim()
-env.DATACLASSES_PATH = sh(script: 'pip3 show dataclasses | grep Location: | cut -d" " -f2', returnStdout: true).trim()
diff --git a/ci/lib/stage-test-examples.jenkinsfile b/ci/lib/stage-test-examples.jenkinsfile
@@ -125,19 +125,6 @@ stage('test-examples') {
             timeout(time: 15, unit: 'MINUTES') {
                 sh '''
                     cd CI-Examples/pytorch
-                    if [ "${os_release_id}" != 'ubuntu' ] && [ "${os_release_id}" != 'debian' ]
-                    then
-                        if [ "${os_release_id}" == 'centos' ] || [ "${os_release_id}" == 'almalinux' ] || [ "${os_release_id}" == 'rockylinux' ]
-                        then
-                            sed -i '$ a loader.argv0_override="{{ entrypoint }}"' pytorch.manifest.template
-                            sed -i -e "/^sgx.trusted_files = \\[.*/a \\"file:$SETUPTOOLS_PATH\\/\\"," pytorch.manifest.template
-                            sed -i -e "/^sgx.trusted_files = \\[.*/a \\"file:$DATACLASSES_PATH\\/\\"," pytorch.manifest.template
-                            sed -i -e "/file:{{ python.distlib }}/,+d" pytorch.manifest.template
-                        else
-                            sed -i \'s/"file:{{ python.distlib }}/"file:\\/usr\\/local\\/lib\\/python3.6\\/site-packages/\' pytorch.manifest.template
-                            sed -i -e "/^sgx.trusted_files = \\[.*/a \\"file:\\/usr\\/lib\\/python3.6\\/site-packages\\/\\"," pytorch.manifest.template
-                        fi
-                    fi
                     python3 download-pretrained-model.py
                     make ${MAKEOPTS} all
                     gramine-${MODE} ./pytorch ./pytorchexample.py

diff --git a/ci/lib/stage-test.jenkinsfile b/ci/lib/stage-test.jenkinsfile
@@ -41,9 +41,6 @@ stage('test') {
                 if (env.no_cpu.toInteger() <= 8) {
                     env.skip_test += " and not large_mmap"
                 }
-                if (env.musl_disable.toBoolean()) {
-                    env.skip_test += " and not tcp_ipv6_v6only "
-                }
                 sh '''
                     cd libos/test/regression
                     if test -n "$SGX"

diff --git a/ltp_config/ltp_tests.cfg b/ltp_config/ltp_tests.cfg
@@ -1355,6 +1355,27 @@ skip = yes
 [posix_fadvise04_64]
 skip = yes
 
+[ppoll01]
+must-pass =
+    1
+    2
+    3
+    4
+    5
+    6
+    7
+    9
+    10
+    11
+    12
+    13
+    14
+    15
+    16
+    17
+    19
+    20
+
 [prctl01]
 skip = yes