Skip to content

Commit

Permalink
Remove check_version in common_functions.sh
Browse files Browse the repository at this point in the history
- remove check_version function
- remove set_version function
resolves : adoptium#4949

Signed-off-by: Anna Babu Palathingal <[email protected]>
  • Loading branch information
annaibm committed Jan 30, 2024
1 parent 9abb319 commit 3e1618e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 28 deletions.
3 changes: 1 addition & 2 deletions external/build_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ check_external_custom=$9
if [[ "${check_external_custom}" == "0" ]]; then
set_test $1
fi
set_version $2
set_vm $3
set_os $4
set_package $5
Expand Down Expand Up @@ -100,4 +99,4 @@ if [ ! -f ${file} ]; then
fi

# Build Dockerfile that was generated
build_image ${file} ${test} ${version} ${vm} ${os} ${package} ${build} ${platform} "${buildArg}"
build_image ${file} ${test} ${version} ${vm} ${os} ${package} ${build} ${platform} "${buildArg}"
27 changes: 1 addition & 26 deletions external/common_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# Supported versions
supported_versions="8 11 17 21 22"

Expand All @@ -32,30 +31,6 @@ supported_builds="full"
# Supported tests
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"

function check_version() {
version=$1

for current_version in ${supported_versions}
do
if [[ "${version}" == "${current_version}" ]]; then
return 1
fi
done

return 0
}

# Set a valid version
function set_version() {
version=$1

if (check_version ${version}); then
echo "ERROR: Invalid Version: ${version}"
echo "Usage: $0 [${supported_versions}]"
exit 1
fi
}

function check_os() {
os=$1

Expand Down Expand Up @@ -213,7 +188,7 @@ function set_test_info() {
check_external_custom_test=$2
cd ../
path_to_file=$(pwd)
echo ${path_to_file}
echo ${path_to_file}
PROPERTY_FILE=${path_to_file}/${test}/test.properties
github_url=$(getProperty "github_url")
test_options=$(getProperty "test_options")
Expand Down

0 comments on commit 3e1618e

Please sign in to comment.