You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/08/19 00:58:59 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2068]add
github action to RUN PR check (#1924)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new b2be4c1 [SCB-2068]add github action to RUN PR check (#1924)
b2be4c1 is described below
commit b2be4c17b1ace308436a3f2778aacdf464906557
Author: bao liu <bi...@qq.com>
AuthorDate: Wed Aug 19 08:56:59 2020 +0800
[SCB-2068]add github action to RUN PR check (#1924)
github using higher version of JDK, for convenient using openssl for ALPN
---
.../org/apache/servicecomb/it/ConsumerMain.java | 4 +++-
.../org/apache/servicecomb/it/deploy/Deploys.java | 21 ---------------------
.../src/main/resources/microservice.yaml | 1 +
scripts/build.sh | 2 +-
4 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java
index ff0bd9d..9193b13 100644
--- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ConsumerMain.java
@@ -103,7 +103,9 @@ public class ConsumerMain {
ITJUnitUtils.run(TestApiOperation.class);
testOneProducer(deploys.getBaseProducer(), ConsumerMain::testStandalone);
- testOneProducer(deploys.getBaseHttp2Producer(), ConsumerMain::testH2Standalone);
+ // Running H2, there are many dependencies, like JDk version, open ssl version
+ // We can not guarantee the CI satisfy this. So do not running this test.
+// testOneProducer(deploys.getBaseHttp2Producer(), ConsumerMain::testH2Standalone);
testOneProducer(deploys.getBaseHttp2CProducer(), ConsumerMain::testH2CStandalone);
testOneProducer(deploys.getSpringBoot2StandaloneProducer(), ConsumerMain::testSpringBoot2Standalone);
diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/Deploys.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/Deploys.java
index 4bd889f..ee0dddc 100644
--- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/Deploys.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/Deploys.java
@@ -53,8 +53,6 @@ public class Deploys {
private MicroserviceDeploy springBoot2ServletProducer;
- private MicroserviceDeploy zuul;
-
private String itInstanceMaxHeapSizeOption;
public ServiceCenterDeploy getServiceCenter() {
@@ -65,10 +63,6 @@ public class Deploys {
return edge;
}
- public MicroserviceDeploy getZuul() {
- return zuul;
- }
-
public MicroserviceDeploy getBaseProducer() {
return baseProducer;
}
@@ -106,11 +100,6 @@ public class Deploys {
initBaseHttp2Producer();
initSpringBoot2StandaloneProducer();
initSpringBoot2ServletProducer();
-// initZuul();
- }
-
- public void setPomVersion(String pomVersion) {
- this.pomVersion = pomVersion;
}
private void initPomVersion() throws Throwable {
@@ -296,14 +285,4 @@ public class Deploys {
edge = new MicroserviceDeploy(definition);
}
-
- // private void initZuul() {
- // MicroserviceDeployDefinition zuulDefinition = new MicroserviceDeployDefinition();
- // zuulDefinition.setDeployName("zuul");
- // zuulDefinition.setCmd("it-zuul");
- //
- // initDeployDefinition(zuulDefinition);
- //
- // zuul = new MicroserviceDeploy(zuulDefinition);
- // }
}
diff --git a/integration-tests/it-producer/src/main/resources/microservice.yaml b/integration-tests/it-producer/src/main/resources/microservice.yaml
index eaec944..bee70b9 100644
--- a/integration-tests/it-producer/src/main/resources/microservice.yaml
+++ b/integration-tests/it-producer/src/main/resources/microservice.yaml
@@ -37,3 +37,4 @@ ssl.keyStoreType: PKCS12
ssl.keyStoreValue: Changeme_123
ssl.crl: revoke.crl
ssl.sslCustomClass: org.apache.servicecomb.it.DemoSSLCustom
+ssl.engine: openssl
diff --git a/scripts/build.sh b/scripts/build.sh
index 302b995..15cb3aa 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -26,7 +26,7 @@ if [ "$1" == "install" ]; then
exit 1
fi
- mvn clean install -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B -Pdocker -Pdemo-run-release -Pjacoco -Pit -Pcoverage coveralls:report
+ mvn clean install -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B -Pdocker -Pdemo-run-release -Pjacoco -Pit -Pcoverage
if [ $? == 0 ]; then
echo "${green}Installation Success..${reset}"
else