Removed tests/integration/native-image/se-1 (#6882)

* Removed tests/integration/native-image. * Updated packaging scripts after removal of se-1. * Remove call to /bin/start. Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com> --------- Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
helidon-io · May 23, 2023 · 28ae8a9 · 28ae8a9
1 parent c3744b5
commit 28ae8a9
Show file tree

Hide file tree

Showing 22 changed files with 7 additions and 1,342 deletions.
diff --git a/etc/scripts/smoketest.sh b/etc/scripts/smoketest.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2019, 2023 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -194,7 +194,7 @@ full(){
         echo "WARNING! GRAALVM_HOME is not set. Skipping native image tests"
     else
         echo "GRAALVM_HOME=${GRAALVM_HOME}"
-        readonly native_image_tests="se-1 mp-1 mp-2 mp-3"
+        readonly native_image_tests="mp-1 mp-2 mp-3"
         for native_test in ${native_image_tests}; do
             cd ${SCRATCH}/helidon/tests/integration/native-image/${native_test}
             mvn ${MAVEN_ARGS} clean package -Pnative-image ${STAGED_PROFILE}

diff --git a/etc/scripts/test-packaging-jar.sh b/etc/scripts/test-packaging-jar.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2023 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,13 +32,6 @@ mvn ${MAVEN_ARGS} -e clean install
 
 # Run tests with classpath and then module path
 
-#
-# Run SE-1 (does not contain module-info.java)
-#
-cd ${WS_DIR}/tests/integration/native-image/se-1
-# Classpath
-java -Dexit.on.started=! -jar target/helidon-tests-native-image-se-1.jar
-
 #
 # Run MP-1
 #

diff --git a/etc/scripts/test-packaging-jlink.sh b/etc/scripts/test-packaging-jlink.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2023 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,21 +32,14 @@ mvn ${MAVEN_ARGS} -e clean install
 
 # Build jlink images
 # mp-2 fails because of https://github.com/oracle/helidon-build-tools/issues/478
-readonly native_image_tests="se-1 mp-1 mp-3"
+readonly native_image_tests="mp-1 mp-3"
 for native_test in ${native_image_tests}; do
     cd ${WS_DIR}/tests/integration/native-image/${native_test}
     mvn ${MAVEN_ARGS} package -e -Pjlink-image,staging -Djlink.image.addClassDataSharingArchive=false -Djlink.image.testImage=false
 done
 
 # Run tests with classpath and then module path
 
-# Run SE-1 (does not contain module-info.java)
-cd ${WS_DIR}/tests/integration/native-image/se-1
-jri_dir=${WS_DIR}/tests/integration/native-image/se-1/target/helidon-tests-native-image-se-1-jri
-
-# Classpath
-${jri_dir}/bin/start --test --jvm --enable-preview
-
 # Run MP-1
 cd ${WS_DIR}/tests/integration/native-image/mp-1
 jri_dir=${WS_DIR}/tests/integration/native-image/mp-1/target/helidon-tests-native-image-mp-1-jri

diff --git a/etc/scripts/test-packaging-native.sh b/etc/scripts/test-packaging-native.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2023 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -58,8 +58,7 @@ mvn ${MAVEN_ARGS} -e clean install
 
 # Build native images
 # TODO:java19
-# readonly native_image_tests="se-1 mp-1 mp-3"
-readonly native_image_tests="se-1 nima-1"
+readonly native_image_tests="nima-1"
 for native_test in ${native_image_tests}; do
     cd ${WS_DIR}/tests/integration/native-image/${native_test}
     mvn ${MAVEN_ARGS} -e clean package -Pnative-image
@@ -71,10 +70,6 @@ done
 # cd ${WS_DIR}/tests/integration/native-image/mp-1
 # ${WS_DIR}/tests/integration/native-image/mp-1/target/helidon-tests-native-image-mp-1 || true
 
-# Run SE-1 exiting on started
-cd ${WS_DIR}/tests/integration/native-image/se-1
-${WS_DIR}/tests/integration/native-image/se-1/target/helidon-tests-native-image-se-1 -Dexit.on.started=! || true
-
 # Run Nima-1 exiting on started
 cd ${WS_DIR}/tests/integration/native-image/nima-1
 ${WS_DIR}/tests/integration/native-image/nima-1/target/helidon-tests-native-image-nima-1 -Dexit.on.started=! || true
diff --git a/tests/integration/native-image/pom.xml b/tests/integration/native-image/pom.xml
@@ -36,7 +36,6 @@
 
     <modules>
         <module>static-content</module>
-        <module>se-1</module>
         <module>mp-1</module>
         <module>mp-2</module>
         <module>mp-3</module>

diff --git a/tests/integration/native-image/se-1/README.md b/tests/integration/native-image/se-1/README.md
diff --git a/tests/integration/native-image/se-1/conf/se.yaml b/tests/integration/native-image/se-1/conf/se.yaml
diff --git a/tests/integration/native-image/se-1/pom.xml b/tests/integration/native-image/se-1/pom.xml