Skip to content

Commit 87d5e55

Browse files
committed
move if to the top
1 parent 27960fc commit 87d5e55

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

jenkins/runRTAtest.fish

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ and TT_init
77
and set -xg RTA_EDITION "C,Cr2"
88
and maintainerOn
99
and eval $EDITION
10+
if test "$ENTERPRISEEDITION" = "On"
11+
set -xg RTA_EDITION "EP,EPr2"
12+
end
1013
and setAllLogsToWorkspace
1114
and switchBranches $ARANGODB_BRANCH $ENTERPRISE_BRANCH true
1215
and updateDockerBuildImage
@@ -29,18 +32,24 @@ if test "$BUILD_MODE" = "release"
2932
echo "switching to release build"
3033
releaseMode
3134
end
35+
36+
37+
and maintainerOn
38+
and eval $EDITION
39+
and eval $TEST_SUITE
40+
and setAllLogsToWorkspace
41+
and switchBranches $ARANGODB_BRANCH $ENTERPRISE_BRANCH true
42+
and updateDockerBuildImage
43+
and begin
44+
end
3245
and pingDetails
3346
and TT_setup
3447
and oskarCompile
3548
and TT_compile
3649
and downloadAuxBinariesToBuildBin
3750
and checkoutRTA
3851
and cd work/release-test-automation/
39-
40-
if test "$ENTERPRISEEDITION" = "On"
41-
set -xg RTA_EDITION "EP,EPr2"
42-
end
43-
bash -x ./jenkins/oskar_tar.sh $argv
52+
and bash -x ./jenkins/oskar_tar.sh $argv
4453

4554
set -l s $status
4655

0 commit comments

Comments
 (0)