Skip to content

Commit 3e1618e

Browse files
committed
Remove check_version in common_functions.sh
- remove check_version function - remove set_version function resolves : #4949 Signed-off-by: Anna Babu Palathingal <[email protected]>
1 parent 9abb319 commit 3e1618e

File tree

2 files changed

+2
-28
lines changed

2 files changed

+2
-28
lines changed

external/build_image.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ check_external_custom=$9
4242
if [[ "${check_external_custom}" == "0" ]]; then
4343
set_test $1
4444
fi
45-
set_version $2
4645
set_vm $3
4746
set_os $4
4847
set_package $5
@@ -100,4 +99,4 @@ if [ ! -f ${file} ]; then
10099
fi
101100

102101
# Build Dockerfile that was generated
103-
build_image ${file} ${test} ${version} ${vm} ${os} ${package} ${build} ${platform} "${buildArg}"
102+
build_image ${file} ${test} ${version} ${vm} ${os} ${package} ${build} ${platform} "${buildArg}"

external/common_functions.sh

+1-26
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
#
15-
1615
# Supported versions
1716
supported_versions="8 11 17 21 22"
1817

@@ -32,30 +31,6 @@ supported_builds="full"
3231
# Supported tests
3332
supported_tests="external_custom camel criu-functional criu-portable-checkpoint criu-portable-restore criu-ubi-portable-checkpoint criu-ubi-portable-restore derby elasticsearch jacoco jenkins functional-test kafka lucene-solr openliberty-mp-tck payara-mp-tck quarkus quarkus_quickstarts scala system-test tomcat tomee wildfly wycheproof netty spring zookeeper"
3433

35-
function check_version() {
36-
version=$1
37-
38-
for current_version in ${supported_versions}
39-
do
40-
if [[ "${version}" == "${current_version}" ]]; then
41-
return 1
42-
fi
43-
done
44-
45-
return 0
46-
}
47-
48-
# Set a valid version
49-
function set_version() {
50-
version=$1
51-
52-
if (check_version ${version}); then
53-
echo "ERROR: Invalid Version: ${version}"
54-
echo "Usage: $0 [${supported_versions}]"
55-
exit 1
56-
fi
57-
}
58-
5934
function check_os() {
6035
os=$1
6136

@@ -213,7 +188,7 @@ function set_test_info() {
213188
check_external_custom_test=$2
214189
cd ../
215190
path_to_file=$(pwd)
216-
echo ${path_to_file}
191+
echo ${path_to_file}
217192
PROPERTY_FILE=${path_to_file}/${test}/test.properties
218193
github_url=$(getProperty "github_url")
219194
test_options=$(getProperty "test_options")

0 commit comments

Comments
 (0)