Skip to content

Commit

Permalink
[2.x] Adding placeholder to keep main/2.x/1.x consistent before #988
Browse files Browse the repository at this point in the history
…backports and disable windows video recording (#1070)

* [2.x] Adding placeholder to keep main/2.x/1.x consistent before #988 backports

Signed-off-by: Peter Zhu <[email protected]>

* Add more

Signed-off-by: Peter Zhu <[email protected]>

---------

Signed-off-by: Peter Zhu <[email protected]>
  • Loading branch information
peterzhuamazon authored Feb 6, 2024
1 parent f45cdf7 commit 4add696
Showing 1 changed file with 20 additions and 3 deletions.
23 changes: 20 additions & 3 deletions integtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ function usage() {
echo -e "-t TEST_COMPONENTS\t(OpenSearch-Dashboards reportsDashboards etc.), optional, specify test components, separate with space, else test everything."
echo -e "-v VERSION\t, no defaults, indicates the OpenSearch version to test."
echo -e "-o OPTION\t, no defaults, determine the TEST_TYPE value among(default, manifest) in test_finder.sh, optional."
echo -e "-r REMOTE_CYPRESS_ENABLED\t(true | false), defaults to true. Feature flag set to specify remote cypress orchestrator runs are enabled or not."
echo -e "-h\tPrint this message."
echo "--------------------------------------------------------------------------"
}

while getopts ":hb:p:s:c:t:v:o:" arg; do
while getopts ":hb:p:s:c:t:v:o:r:" arg; do
case $arg in
h)
usage
Expand All @@ -50,6 +51,9 @@ while getopts ":hb:p:s:c:t:v:o:" arg; do
o)
OPTION=$OPTARG
;;
r)
REMOTE_CYPRESS_ENABLED=$OPTARG
;;
:)
echo "-${OPTARG} requires an argument"
usage
Expand Down Expand Up @@ -78,6 +82,11 @@ then
SECURITY_ENABLED="true"
fi

if [ -z "$REMOTE_CYPRESS_ENABLED" ]
then
REMOTE_CYPRESS_ENABLED="true"
fi

if [ -z "$CREDENTIAL" ]
then
# Starting in 2.12.0, security demo configuration script requires an initial admin password
Expand Down Expand Up @@ -108,11 +117,19 @@ echo "BROWSER_PATH: $BROWSER_PATH"
#
# We need to ensure the cypress tests are the last execute process to
# the error code gets passed to the CI.
if [ $SECURITY_ENABLED = "true" ]

if [ "$OSTYPE" = "msys" ] || [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "win32" ]; then
echo "Disable video recording in Windows due to ffmpeg missing libs in Windows Docker Container"
echo "TODO: https://github.com/opensearch-project/opensearch-dashboards-functional-test/issues/1068"
jq '. + {"video": false}' cypress.json > cypress_new.json # jq does not allow reading and writing on same file
mv -v cypress_new.json cypress.json
fi

if [ "$SECURITY_ENABLED" = "true" ]
then
echo "run security enabled tests"
yarn cypress:run-with-security --browser "$BROWSER_PATH" --spec "$TEST_FILES"
else
echo "run security disabled tests"
yarn cypress:run-without-security --browser "$BROWSER_PATH" --spec "$TEST_FILES"
fi
fi

0 comments on commit 4add696

Please sign in to comment.