Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
etf
cmssam
Commits
7ef5c213
Commit
7ef5c213
authored
Dec 01, 2020
by
Edita Kizinevic
Browse files
Update variable name
parent
e8329e73
Changes
1
Hide whitespace changes
Inline
Side-by-side
SiteTests/FroNtier/tests/CE-cms-squid
View file @
7ef5c213
...
...
@@ -2,7 +2,7 @@
shopt
-s
expand_aliases
SCRIPT_REVISION
=
"2020-1
1-26
"
SCRIPT_REVISION
=
"2020-1
2-01
"
MAINTAINERS
=
"Dave Dykstra and Edita Kizinevic"
SCRIPT_NAME
=
`
basename
"
$0
"
`
...
...
@@ -132,25 +132,25 @@ echo
cd
$CMSREL
/src
cmsenv
# Use IPv6 if frontier client version is 2.9 or greater
# Use IPv6
addresses
if frontier client version is 2.9 or greater
frontier_client
=
`
echo
$FRONTIER_CLIENT
|
sed
's/.*frontier_client\///'
`
frontier_major_version
=
${
frontier_client
%%.*
}
frontier_minor_version
=
${
frontier_client
#*.
}
frontier_minor_version
=
${
frontier_minor_version
%%.*
}
use_IPv6
=
false
use_IPv6
_addresses
=
false
re
=
'^[0-9]+$'
if
[[
$frontier_major_version
=
~
$re
]]
&&
[[
$frontier_minor_version
=
~
$re
]]
;
then
if
[
"
$frontier_major_version
"
-gt
"2"
]
;
then
use_IPv6
=
true
use_IPv6
_addresses
=
true
elif
[
"
$frontier_major_version
"
-eq
"2"
]
&&
[
"
$frontier_minor_version
"
-ge
"9"
]
;
then
use_IPv6
=
true
use_IPv6
_addresses
=
true
fi
fi
# Function to check proxies
# $1 - list of proxies
# $2 - $pilot
# $3 - $use_IPv6
# $3 - $use_IPv6
_addresses
check_proxies
()
{
# Script does not use backupproxyurl if it is SAM test, but script uses backupproxyurl if it is pilot
if
$2
;
then
...
...
@@ -246,7 +246,7 @@ ever_failed=false
ever_succeeded
=
false
found_proxyconfig
=
false
found_proxy
=
false
check_proxies
"
$FNCONNECT
"
$pilot
$use_IPv6
check_proxies
"
$FNCONNECT
"
$pilot
$use_IPv6
_addresses
#Check test results
if
[
"
$failover
"
==
true
]
;
then
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment