Skip to content

Commit 1ae4952

Browse files
committed
move if to the top
1 parent 1b1afa3 commit 1ae4952

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

jenkins/runRTAtest.fish

+13-10
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ cleanPrepareLockUpdateClear2
66
TT_init
77
set -xg RTA_EDITION "C,Cr2"
88

9-
and maintainerOn
10-
and eval $EDITION
11-
and eval $TEST_SUITE
12-
and setAllLogsToWorkspace
13-
and switchBranches $ARANGODB_BRANCH $ENTERPRISE_BRANCH true
14-
and updateDockerBuildImage
15-
or exit 1
9+
if test "$ENTERPRISEEDITION" = "On"
10+
set -xg RTA_EDITION "EP,EPr2"
11+
end
1612
if test "$ASAN" = "true"
1713
echo "San build"
1814
sanOn
@@ -31,16 +27,23 @@ if test "$BUILD_MODE" = "release"
3127
echo "switching to release build"
3228
releaseMode
3329
end
30+
31+
32+
and maintainerOn
33+
and eval $EDITION
34+
and eval $TEST_SUITE
35+
and setAllLogsToWorkspace
36+
and switchBranches $ARANGODB_BRANCH $ENTERPRISE_BRANCH true
37+
and updateDockerBuildImage
38+
and begin
39+
end
3440
and pingDetails
3541
and TT_setup
3642
and oskarCompile
3743
and TT_compile
3844
and downloadAuxBinariesToBuildBin
3945
and checkoutRTA
4046
and cd work/release-test-automation/
41-
if test "$ENTERPRISEEDITION" = "On"
42-
set -xg RTA_EDITION "EP,EPr2"
43-
end
4447
and bash -x ./jenkins/oskar_tar.sh $argv
4548

4649
set -l s $status

0 commit comments

Comments
 (0)