Skip to content

Commit db9394a

Browse files
shaojunwangsuperajun-wsj
shaojunwang
authored and
superajun-wsj
committed
support anolisos8.6
1 parent 7528755 commit db9394a

File tree

45 files changed

+565
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+565
-172
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,31 @@ jobs:
1515
- name: Check out repository code
1616
uses: actions/checkout@v3
1717
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
18-
- run: echo "🖥️ The workflow is now ready to test your code on the runner."
18+
- run: echo "🖥️ The workflow is now ready to test your code on the runner in ubuntu18.04 container."
1919
- name: List files in the repository
2020
run: ls ${{ github.workspace }}
2121
- name: Build JavaEnclave
22-
run: sudo ${{ github.workspace }}/tools/cicd/make.sh build
22+
run: ${{ github.workspace }}/tools/cicd/ubuntu-18.04/make.sh build
2323
- name: Release JavaEnclave
24-
run: sudo ${{ github.workspace }}/tools/cicd/make.sh release
24+
run: ${{ github.workspace }}/tools/cicd/ubuntu-18.04/make.sh release
2525
- name: Test JavaEnclave
26-
run: sudo ${{ github.workspace }}/tools/cicd/make.sh test
26+
run: ${{ github.workspace }}/tools/cicd/ubuntu-18.04/make.sh test
2727
- name: Run JavaEnclave Samples
28-
run: sudo ${{ github.workspace }}/tools/cicd/make.sh samples
28+
run: ${{ github.workspace }}/tools/cicd/ubuntu-18.04/make.sh samples
2929
- name: Run JavaEnclave Benchmark
30-
run: sudo ${{ github.workspace }}/tools/cicd/make.sh benchmark
30+
run: ${{ github.workspace }}/tools/cicd/ubuntu-18.04/make.sh benchmark
31+
- run: echo "🍏 This job's status is ${{ job.status }}."
32+
- run: echo "🖥️ The workflow is now ready to test your code on the runner in anolis8.6 container."
33+
- name: List files in the repository
34+
run: ls ${{ github.workspace }}
35+
- name: Build JavaEnclave
36+
run: ${{ github.workspace }}/tools/cicd/anolis-8.6/make.sh build
37+
- name: Release JavaEnclave
38+
run: ${{ github.workspace }}/tools/cicd/anolis-8.6/make.sh release
39+
- name: Test JavaEnclave
40+
run: ${{ github.workspace }}/tools/cicd/anolis-8.6/make.sh test
41+
- name: Run JavaEnclave Samples
42+
run: ${{ github.workspace }}/tools/cicd/anolis-8.6/make.sh samples
43+
- name: Run JavaEnclave Benchmark
44+
run: ${{ github.workspace }}/tools/cicd/anolis-8.6/make.sh benchmark
3145
- run: echo "🍏 This job's status is ${{ job.status }}."

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,7 @@ public class Main {
173173
EnclaveType[] enclaveTypes = {
174174
EnclaveType.MOCK_IN_JVM,
175175
EnclaveType.MOCK_IN_SVM,
176-
EnclaveType.TEE_SDK,
177-
EnclaveType.EMBEDDED_LIB_OS};
176+
EnclaveType.TEE_SDK};
178177

179178
for (EnclaveType enclaveType : enclaveTypes) {
180179
Enclave enclave = EnclaveFactory.create(enclaveType);

‎archetype/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<maven.compiler.source>11</maven.compiler.source>
1111
<maven.compiler.target>11</maven.compiler.target>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13-
<org.apache.teaclave.javasdk.platform>MOCK_IN_SVM:TEE_SDK:EMBEDDED_LIB_OS</org.apache.teaclave.javasdk.platform>
13+
<org.apache.teaclave.javasdk.platform>MOCK_IN_SVM:TEE_SDK</org.apache.teaclave.javasdk.platform>
1414
</properties>
1515
<dependencyManagement>
1616
<dependencies>

‎benchmark/guomi/host/src/main/java/org/apache/teaclave/javasdk/benchmark/guomi/host/GuoMiBenchMark.java‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class GuoMiBenchMark {
4242

4343
public final String sm3Context = "Hello World!";
4444

45-
@Param(value = {"MOCK_IN_JVM", "MOCK_IN_SVM", "TEE_SDK", "EMBEDDED_LIB_OS"})
45+
@Param(value = {"MOCK_IN_JVM", "MOCK_IN_SVM", "TEE_SDK"})
4646
private String enclaveServiceInstance;
4747
@Param(value = {"SM2", "SM3", "SM4"})
4848
private String smAlgo;
@@ -55,8 +55,6 @@ public static class EnclaveBenchmark {
5555
private SMService mockSVMService = null;
5656
private Enclave teeSDKEnclave = null;
5757
private SMService teeSDKService = null;
58-
private Enclave embeddedLibOSEnclave = null;
59-
private SMService embeddedLibOSService = null;
6058

6159
@Setup
6260
public void createEnclave() throws Exception {
@@ -66,16 +64,13 @@ public void createEnclave() throws Exception {
6664
mockSVMService = mockSVMEnclave.load(SMService.class).next();
6765
teeSDKEnclave = EnclaveFactory.create(EnclaveType.TEE_SDK);
6866
teeSDKService = teeSDKEnclave.load(SMService.class).next();
69-
embeddedLibOSEnclave = EnclaveFactory.create(EnclaveType.EMBEDDED_LIB_OS);
70-
embeddedLibOSService = embeddedLibOSEnclave.load(SMService.class).next();
7167
}
7268

7369
@TearDown
7470
public void destroyEnclave() throws Exception {
7571
mockJVMEnclave.destroy();
7672
mockSVMEnclave.destroy();
7773
teeSDKEnclave.destroy();
78-
embeddedLibOSEnclave.destroy();
7974
}
8075

8176
public SMService getMockJVMServiceInstance() {
@@ -89,10 +84,6 @@ public SMService getMockSVMServiceInstance() {
8984
public SMService getTeeSDKServiceInstance() {
9085
return teeSDKService;
9186
}
92-
93-
public SMService getEmbeddedLibOSServiceInstance() {
94-
return embeddedLibOSService;
95-
}
9687
}
9788

9889
private void smBenchmarkImpl(EnclaveBenchmark enclave, String serviceName, String smAlgo) throws Exception {
@@ -107,9 +98,6 @@ private void smBenchmarkImpl(EnclaveBenchmark enclave, String serviceName, Strin
10798
case "TEE_SDK":
10899
service = enclave.getTeeSDKServiceInstance();
109100
break;
110-
case "EMBEDDED_LIB_OS":
111-
service = enclave.getEmbeddedLibOSServiceInstance();
112-
break;
113101
}
114102

115103
int sm2Weight = 10;

‎benchmark/guomi/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<maven.compiler.source>11</maven.compiler.source>
2626
<maven.compiler.target>11</maven.compiler.target>
2727
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
28-
<org.apache.teaclave.javasdk.platform>MOCK_IN_SVM:TEE_SDK:EMBEDDED_LIB_OS</org.apache.teaclave.javasdk.platform>
28+
<org.apache.teaclave.javasdk.platform>MOCK_IN_SVM:TEE_SDK</org.apache.teaclave.javasdk.platform>
2929
</properties>
3030
<dependencyManagement>
3131
<dependencies>

‎benchmark/guomi/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#/bin/bash
1+
#!/bin/bash
22

33
# Licensed to the Apache Software Foundation (ASF) under one
44
# or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
1919

2020
mvn -Pnative clean package
2121

22-
OCCLUM_RELEASE_ENCLAVE=true java -Dorg.apache.teaclave.javasdk.enclave.metric.enable=false -cp host/target/host-1.0-SNAPSHOT-jar-with-dependencies.jar:enclave/target/enclave-1.0-SNAPSHOT-jar-with-dependencies.jar org.apache.teaclave.javasdk.benchmark.guomi.host.GuoMiBenchMark
22+
OCCLUM_RELEASE_ENCLAVE=true $JAVA_HOME/bin/java -Dorg.apache.teaclave.javasdk.enclave.metric.enable=false -cp host/target/host-1.0-SNAPSHOT-jar-with-dependencies.jar:enclave/target/enclave-1.0-SNAPSHOT-jar-with-dependencies.jar org.apache.teaclave.javasdk.benchmark.guomi.host.GuoMiBenchMark

‎benchmark/string/host/src/main/java/org/apache/teaclave/javasdk/benchmark/string/host/StringBenchMark.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
@OutputTimeUnit(TimeUnit.MILLISECONDS)
2424
public class StringBenchMark {
2525

26-
@Param(value = {"MOCK_IN_JVM", "MOCK_IN_SVM", "TEE_SDK", "EMBEDDED_LIB_OS"})
26+
@Param(value = {"MOCK_IN_JVM", "MOCK_IN_SVM", "TEE_SDK"})
2727
private String enclaveServiceInstance;
2828
@Param(value = {"regex", "concat", "split"})
2929
private String stringOpt;
@@ -47,16 +47,13 @@ public void createEnclave() throws Exception {
4747
mockSVMService = mockSVMEnclave.load(StringOperationMetric.class).next();
4848
teeSDKEnclave = EnclaveFactory.create(EnclaveType.TEE_SDK);
4949
teeSDKService = teeSDKEnclave.load(StringOperationMetric.class).next();
50-
embeddedLibOSEnclave = EnclaveFactory.create(EnclaveType.EMBEDDED_LIB_OS);
51-
embeddedLibOSService = embeddedLibOSEnclave.load(StringOperationMetric.class).next();
5250
}
5351

5452
@TearDown
5553
public void destroyEnclave() throws Exception {
5654
mockJVMEnclave.destroy();
5755
mockSVMEnclave.destroy();
5856
teeSDKEnclave.destroy();
59-
embeddedLibOSEnclave.destroy();
6057
}
6158

6259
public StringOperationMetric getMockJVMServiceInstance() {
@@ -70,10 +67,6 @@ public StringOperationMetric getMockSVMServiceInstance() {
7067
public StringOperationMetric getTeeSDKServiceInstance() {
7168
return teeSDKService;
7269
}
73-
74-
public StringOperationMetric getEmbeddedLibOSServiceInstance() {
75-
return embeddedLibOSService;
76-
}
7770
}
7871

7972
private void stringBenchMarkImpl(EnclaveBenchmark enclave, String enclaveServiceInstance, String stringOpt) {
@@ -88,9 +81,6 @@ private void stringBenchMarkImpl(EnclaveBenchmark enclave, String enclaveService
8881
case "TEE_SDK":
8982
service = enclave.getTeeSDKServiceInstance();
9083
break;
91-
case "EMBEDDED_LIB_OS":
92-
service = enclave.getEmbeddedLibOSServiceInstance();
93-
break;
9484
}
9585

9686
int regexWeight = 5000;

‎benchmark/string/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<maven.compiler.source>11</maven.compiler.source>
2626
<maven.compiler.target>11</maven.compiler.target>
2727
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
28-
<org.apache.teaclave.javasdk.platform>MOCK_IN_SVM:TEE_SDK:EMBEDDED_LIB_OS</org.apache.teaclave.javasdk.platform>
28+
<org.apache.teaclave.javasdk.platform>MOCK_IN_SVM:TEE_SDK</org.apache.teaclave.javasdk.platform>
2929
</properties>
3030
<dependencyManagement>
3131
<dependencies>

‎benchmark/string/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#/bin/bash
1+
#!/bin/bash
22

33
mvn -Pnative clean package
44

5-
OCCLUM_RELEASE_ENCLAVE=true java -Dorg.apache.teaclave.javasdk.enclave.metric.enable=false -cp host/target/host-1.0-SNAPSHOT-jar-with-dependencies.jar:enclave/target/enclave-1.0-SNAPSHOT-jar-with-dependencies.jar org.apache.teaclave.javasdk.benchmark.string.host.StringBenchMark
5+
OCCLUM_RELEASE_ENCLAVE=true $JAVA_HOME/bin/java -Dorg.apache.teaclave.javasdk.enclave.metric.enable=false -cp host/target/host-1.0-SNAPSHOT-jar-with-dependencies.jar:enclave/target/enclave-1.0-SNAPSHOT-jar-with-dependencies.jar org.apache.teaclave.javasdk.benchmark.string.host.StringBenchMark

‎coverage/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ wget https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/0.8.3/jac
3030
popd
3131

3232
# Generate Teaclave java sdk test coverage data.
33-
OCCLUM_RELEASE_ENCLAVE=true java -javaagent:jacoco/lib/jacocoagent.jar=destfile=./result/jacoco.exec,append=true,classdumpdir=result/classes,includes=org.apache.teaclave.javasdk.host.*:org.apache.teaclave.javasdk.common.*:org.apache.teaclave.javasdk.enclave.*,output=file -cp ${TEST_PATH}/host/target/host-0.1.0-jar-with-dependencies.jar:${TEST_PATH}enclave/target/enclave-0.1.0-jar-with-dependencies.jar org.apache.teaclave.javasdk.test.host.TestMain
33+
OCCLUM_RELEASE_ENCLAVE=true $JAVA_HOME/bin/java -javaagent:jacoco/lib/jacocoagent.jar=destfile=./result/jacoco.exec,append=true,classdumpdir=result/classes,includes=org.apache.teaclave.javasdk.host.*:org.apache.teaclave.javasdk.common.*:org.apache.teaclave.javasdk.enclave.*,output=file -cp ${TEST_PATH}/host/target/host-0.1.0-jar-with-dependencies.jar:${TEST_PATH}enclave/target/enclave-0.1.0-jar-with-dependencies.jar org.apache.teaclave.javasdk.test.host.TestMain
3434

3535
# Generate Teaclave java sdk test coverage report.
36-
java -jar jacoco/lib/jacococli.jar report result/jacoco.exec --classfiles result/classes --html site
36+
$JAVA_HOME/bin/java -jar jacoco/lib/jacococli.jar report result/jacoco.exec --classfiles result/classes --html site

0 commit comments

Comments
 (0)