arangodb
diff --git a/Diff for: ‎README.md
+94 b/Diff for: ‎README.md
+94
diff --git a/Diff for: ‎containers/buildUbuntu3.docker/Dockerfile
+4-4 b/Diff for: ‎containers/buildUbuntu3.docker/Dockerfile
+4-4
diff --git a/Diff for: ‎containers/buildUbuntu4.docker/Dockerfile
+5-2 b/Diff for: ‎containers/buildUbuntu4.docker/Dockerfile
+5-2
diff --git a/Diff for: ‎containers/buildUbuntu5.docker/Dockerfile
+4-2 b/Diff for: ‎containers/buildUbuntu5.docker/Dockerfile
+4-2
diff --git a/Diff for: ‎containers/buildUbuntu6.docker/Dockerfile
+3-1 b/Diff for: ‎containers/buildUbuntu6.docker/Dockerfile
+3-1
diff --git a/Diff for: ‎helper.fish
+4-3 b/Diff for: ‎helper.fish
+4-3
diff --git a/Diff for: ‎helper.linux.fish
+6-6 b/Diff for: ‎helper.linux.fish
+6-6
diff --git a/Diff for: ‎helper.psm1
+14-8 b/Diff for: ‎helper.psm1
+14-8
diff --git a/Diff for: ‎jenkins/helper/allure_commons/_allure.py
+2 b/Diff for: ‎jenkins/helper/allure_commons/_allure.py
+2
@@ -234,6 +234,100 @@ if supported, set number of concurrent builds to `PARALLELISM`
 
 ## Testing
 
+`jenkins/helper/test_launch_controller.py` is used to control multiple test executions.
+
+### Its dependencies over stock python3 are:
+ - psutil to control subprocesses
+ - py7zr (optional) to build 7z reports instead of tar.bz2
+
+### It's reading these environment variables:
+- `INNERWORKDIR` - as the directory to place the report files
+- `WORKDIR` - used instead if `INNERWORKDIR` hasn't been set.
+- `TEMP` - temporary directory if not `INNERWORKDIR`/ArangoDB
+- `TMPDIR` and `TEMP` are passed to the executors.
+- `TSHARK` passed as value to `--sniffProgram`
+- `DUMPDEVICE` passed as value to `--sniffDevice`
+- `SKIPNONDETERMINISTIC` passed on as value to `--skipNondeterministic` to the testing.
+- `SKIPTIMECRITICAL` passed on as value to `--skipTimeCritical` to the testing.
+- `BUILDMODE` passed on as value to `--buildType` to the testing.
+- `DUMPAGENCYONERROR` passed on as value to `--dumpAgencyOnError` to the testing.
+- `PORTBASE` passed on as value to `--minPort` and `--maxPort` (+99) to the testing. Defaults to 7000
+- `SKIPGREY` passed on as value to `--skipGrey` to the testing.
+- `ONLYGREY` passed on as value to `--onlyGrey` to the testing.
+- `TIMELIMIT` is used to calculate the execution deadline starting point in time.
+- `COREDIR` the directory to locate coredumps for crashes
+- `LDAPHOST` to enable the tests with `ldap` flags.
+- any parameter in `test-definition.txt` that starts with a `$` is expanded to its value.
+
+### Its Parameters are:
+ - `PATH/test-definition.txt` - (first parameter) test definitions file from the arangodb source tree
+   (also used to locate the arangodb source)
+ - `-f` `[launch|dump]` use `dump` for syntax checking of `test-definition.txt` instead of executing the tests
+ - `--validate-only` don't run the tests
+ - `--help-flags` list the flags which can be used in `test-definition.txt`:
+    - `cluster`: this test requires a cluster
+    - `single`: this test requires a single server
+    - `full`: this test is only executed in full tests
+    - `!full`: this test is only executed in non-full tests
+    - `gtest`: only the gtests are to be executed
+    - `ldap`: ldap
+    - `enterprise`: this test is only executed with the enterprise version
+    - `!windows`: test is excluded from ps1 output
+ - `--cluster` filter `test-definition.txt` for all tests flagged as `cluster`
+ - `--full` - all tests including those flagged as `full` are executed.
+ - `--gtest` - only gtests are executed
+ - `--all` - output unfiltered
+ 
+### Syntax in `test-definition.txt`
+Lines consist of these parts:
+```
+testingJsSuiteName flags params suffix -- args to testing.js
+```
+where 
+- `flags` are listed above in `--help-flags`
+- params are:
+  - weight - sequence priority of test, 250 is the default.
+  - wweight - execution slots to book. defaults to 1, if cluster 4.
+  - buckets - split testcases to be launched in concurent chunks
+  Specifying a `*` in front of the number takes the default and multiplies it by the value.
+- suffix - if a testsuite is launched several times, make it distinguishable
+  like shell_aql => shell_aql_vst ; Bucket indexes are appended afterwards.
+- `--` literally the two dashes to split the line at.
+- `args to testing.js` - anything that `./scripts/unittest --help` would print you.
+
+### job scheduling
+To utilize all of the machines resources, tests can be run in parallel. The `execution_slots` are 
+set to the number of the physical cores of the machine (not threads).
+`wweight` is used to add the currently expected load by the tests to be no more than `execution_slots`.
+
+For managing each of these parallel executions of testing.js, worker threads are used. The workers
+themselves will spawn a set of I/O threads to capture the output of testing.js into a report file.
+
+The life cycle of a testrun will be as follows:
+
+ - the environment variable `TIMELIMIT` defines a *deadline* to all the tests, how much seconds should be allowed.
+ - tests are running in worker threads.
+ - main thread keeps control, launches more worker threads, once machine bandwith permits, but only every 5s as closest to not overwhelm the machine while launching arangods.
+ - tests themselves have their timeouts; `testing.js` will abort if they are reached.
+ - workers have a progressive timeout, if it doesn't hear back from `testing.js` for 999999999s it will hard kill and abort. [currently high / not used!]
+ - if workers have no output from `testing.js` they check whether the *deadline* is reached.
+ - if the *deadline* is reached, `SIG_INT`[* nix] / `SIG_BREAK`[windows] is sent to `testing.js` to trigger its *deadline* feature.
+ - the reached *deadline* will be indicated to the `testfailures.txt` report file and the logfile of the test in question.
+ - with *deadline* engageged, `testing.js` can send no more subsequent requests, nor spawn processes => eventually testing will abort.
+ - force shutdown of arangod Instances will reset the deadline, SIG_ABRT arangods, and try to do core dump analysis.
+ - workers continue reading pipes from `testing.js`, but once no chars are comming, `waitpid()` checks with a 1s timout whether `testing.js` is done and exited.
+ - if the worker reaches `180` counters of `waitpid()` invocations it will give up. It will hard kill `testing.js` and all other child processes it can find.
+ - this should unblock the workers I/O threads, and they should exit.
+ - the `waitpid()` on `testing.js` should exit, I/O threads should be joined, results should be passed up to the main thread.
+ - so the workers still have a slugish interpretation of the *deadline*, giving them the chance to collect as much knowledge about the test execution as posible.
+ - meanwhile the main thread has a *fixed* deadline: 5 minutes after the `TIMELIMIT` is reached.
+ - if not all workers have indicated their exit before this final deadline:
+   - the main thread will start killing any subprocesses of itself which it finds.
+   - after this wait another 20s, to see whether the workers may have been unblocked by the killing
+ - if not, it shouts "Geronimoooo" and takes the big shotgun, and force-terminates the python process which is running it. This will kill all threads as well and terminate the process.
+ - if all workers have indicated their exit in time, their threads will be joined.
+ - reports will be generated.
+
 ## Packaging
 
     makeRelease
 
@@ -7,13 +7,13 @@ ENV COMPILER_VERSION 9
 
 ENV CLANG_VERSION 12
 
-RUN apt-get update && \
+RUN apt-get update --fix-missing && \
     apt-get install -y software-properties-common && \
     add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
     apt-get update && \
-    apt-get upgrade -y
-
-RUN apt-get install -y build-essential gcc-${COMPILER_VERSION} g++-${COMPILER_VERSION} cmake make bison flex python python3-distutils ccache git libjemalloc-dev vim exuberant-ctags gdb fish ruby ruby-httparty ruby-rspec psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus && gem install persistent_httparty && apt-get clean
+    apt-get upgrade -y && \
+    apt-get install -y build-essential gcc-${COMPILER_VERSION} g++-${COMPILER_VERSION} cmake make bison flex python3-psutil python3-distutils ccache git libjemalloc-dev vim exuberant-ctags gdb fish psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus &&\
+    apt-get clean
 
 RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-${ARCH}-unknown-linux-musl.tar.gz | tar xvz -C /tmp && mv /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl/sccache /usr/bin/sccache && chmod +x /usr/bin/sccache && rm -rf /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl
 
 
@@ -1,3 +1,4 @@
+
 FROM ubuntu:20.04
 MAINTAINER Max Neunhoeffer <[email protected]>
 
@@ -7,12 +8,12 @@ ENV COMPILER_VERSION 9
 
 ENV CLANG_VERSION 12
 
-RUN apt-get update && \
+RUN apt-get update --fix-missing && \
     apt-get install -y software-properties-common && \
     apt-get update && \
     apt-get upgrade -y
 
-RUN apt-get install -y build-essential gcc-${COMPILER_VERSION} g++-${COMPILER_VERSION} cmake make bison flex python ccache git libjemalloc-dev vim exuberant-ctags gdb fish ruby ruby-httparty ruby-rspec psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus && gem install persistent_httparty && apt-get clean
+RUN apt-get install -y build-essential gcc-${COMPILER_VERSION} g++-${COMPILER_VERSION} cmake make bison flex python ccache git libjemalloc-dev vim exuberant-ctags gdb fish psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus && apt-get clean
 
 RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-${ARCH}-unknown-linux-musl.tar.gz | tar xvz -C /tmp && mv /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl/sccache /usr/bin/sccache && chmod +x /usr/bin/sccache && rm -rf /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl
 
@@ -32,4 +33,6 @@ RUN git config --global --add safe.directory /work/ArangoDB
 RUN git config --global --add safe.directory /work/ArangoDB/enterprise
 RUN git config --global --add safe.directory /work/ArangoDB/docs
 
+RUN apt-get install -y python3-pip && pip3 install py7zr psutil 
+
 CMD [ "/usr/bin/fish" ]
@@ -7,12 +7,12 @@ ENV COMPILER_VERSION 10
 
 ENV CLANG_VERSION 12
 
-RUN apt-get update && \
+RUN apt-get update --fix-missing && \
     apt-get install -y software-properties-common && \
     apt-get update && \
     apt-get upgrade -y
 
-RUN apt-get install -y build-essential gcc-${COMPILER_VERSION} g++-${COMPILER_VERSION} cmake make bison flex python ccache git libjemalloc-dev vim exuberant-ctags gdb fish ruby ruby-httparty ruby-rspec psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus && gem install persistent_httparty && apt-get clean
+RUN apt-get install -y build-essential gcc-${COMPILER_VERSION} g++-${COMPILER_VERSION} cmake make bison flex python ccache git libjemalloc-dev vim exuberant-ctags gdb fish psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus && apt-get clean
 
 RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-${ARCH}-unknown-linux-musl.tar.gz | tar xvz -C /tmp && mv /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl/sccache /usr/bin/sccache && chmod +x /usr/bin/sccache && rm -rf /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl
 
@@ -37,4 +37,6 @@ RUN git config --global --add safe.directory /work/ArangoDB/3rdParty/iresearch
 RUN git config --global --add safe.directory /work/ArangoDB/3rdParty/rocksdb
 RUN git config --global --add safe.directory /work/ArangoDB/3rdParty/velocypack
 
+RUN apt-get install -y python3-pip && pip3 install py7zr psutil 
+
 CMD [ "/usr/bin/fish" ]
@@ -7,7 +7,7 @@ ENV COMPILER_VERSION 11
 
 ENV CLANG_VERSION 14
 
-RUN apt-get update && \
+RUN apt-get update --fix-missing && \
     apt-get install -y software-properties-common && \
     apt-get update && \
     apt-get upgrade -y
@@ -39,4 +39,6 @@ RUN git config --global --add safe.directory /work/ArangoDB/3rdParty/iresearch
 RUN git config --global --add safe.directory /work/ArangoDB/3rdParty/rocksdb
 RUN git config --global --add safe.directory /work/ArangoDB/3rdParty/velocypack
 
+RUN apt-get install -y python3-pip && pip3 install py7zr psutil
+
 CMD [ "/usr/bin/fish" ]
@@ -95,7 +95,8 @@ end
 function single ; set -gx TESTSUITE single ; end
 function cluster ; set -gx TESTSUITE cluster ; end
 function resilience ; set -gx TESTSUITE resilience ; end
-function catchtest ; set -gx TESTSUITE catchtest ; end
+function catchtest ; set -gx TESTSUITE gtest ; end
+function gtest ; set -gx TESTSUITE gtest ; end
 if test -z "$TESTSUITE" ; cluster
 else ; set -gx TESTSUITE $TESTSUITE ; end
 
@@ -1518,7 +1519,7 @@ function showConfig
   printf $fmt3 'SkipGrey'       $SKIPGREY      '(skipGrey/includeGrey)'
   printf $fmt3 'OnlyGrey'       $ONLYGREY      '(onlyGreyOn/onlyGreyOff)'
   printf $fmt3 'Storage engine' $STORAGEENGINE '(mmfiles/rocksdb)'
-  printf $fmt3 'Test suite'     $TESTSUITE     '(single/cluster/resilience/catchtest)'
+  printf $fmt3 'Test suite'     $TESTSUITE     '(single/cluster/resilience/gtest)'
   printf $fmt2 'Log Levels'     (echo $LOG_LEVELS)
   echo
   echo 'Package Configuration'
@@ -1977,7 +1978,7 @@ function moveResultsToWorkspace
       mv $WORKDIR/work/coverage $WORKSPACE
     end
 
-    set -l matches $WORKDIR/work/*.{asc,deb,dmg,rpm,tar.gz,tar.bz2,zip,html,csv}
+    set -l matches $WORKDIR/work/*.{asc,testfailures.txt,deb,dmg,rpm,7z,tar.gz,tar.bz2,zip,html,csv}
     for f in $matches
       echo $f | grep -qv testreport ; and echo "mv $f" ; and mv $f $WORKSPACE; or echo "skipping $f"
     end
 
@@ -15,19 +15,19 @@ set -gx ARCH (uname -m)
 set IMAGE_ARGS "--build-arg ARCH=$ARCH"
 
 set -gx UBUNTUBUILDIMAGE3_NAME arangodb/ubuntubuildarangodb3-$ARCH
-set -gx UBUNTUBUILDIMAGE3_TAG 16
+set -gx UBUNTUBUILDIMAGE3_TAG 17
 set -gx UBUNTUBUILDIMAGE3 $UBUNTUBUILDIMAGE3_NAME:$UBUNTUBUILDIMAGE3_TAG
 
 set -gx UBUNTUBUILDIMAGE4_NAME arangodb/ubuntubuildarangodb4-$ARCH
-set -gx UBUNTUBUILDIMAGE4_TAG 17
+set -gx UBUNTUBUILDIMAGE4_TAG 18
 set -gx UBUNTUBUILDIMAGE4 $UBUNTUBUILDIMAGE4_NAME:$UBUNTUBUILDIMAGE4_TAG
 
 set -gx UBUNTUBUILDIMAGE5_NAME arangodb/ubuntubuildarangodb5-$ARCH
-set -gx UBUNTUBUILDIMAGE5_TAG 10
+set -gx UBUNTUBUILDIMAGE5_TAG 11
 set -gx UBUNTUBUILDIMAGE5 $UBUNTUBUILDIMAGE5_NAME:$UBUNTUBUILDIMAGE5_TAG
 
 set -gx UBUNTUBUILDIMAGE6_NAME arangodb/ubuntubuildarangodb6-$ARCH
-set -gx UBUNTUBUILDIMAGE6_TAG 2
+set -gx UBUNTUBUILDIMAGE6_TAG 3
 set -gx UBUNTUBUILDIMAGE6 $UBUNTUBUILDIMAGE6_NAME:$UBUNTUBUILDIMAGE6_TAG
 
 set -gx UBUNTUPACKAGINGIMAGE arangodb/ubuntupackagearangodb-$ARCH:1
@@ -453,11 +453,11 @@ function oskar
   and if test "$SAN" = "On"
     parallelism 2
     clearSanStatus
-    runInContainer --cap-add SYS_NICE --cap-add SYS_PTRACE (findBuildImage) $SCRIPTSDIR/runTests.fish $argv
+    runInContainer --security-opt seccomp=unconfined --cap-add SYS_NICE --cap-add SYS_PTRACE (findBuildImage) $SCRIPTSDIR/runTests.fish $argv
     set s $status
     set s (math $s + (getSanStatus))
   else
-    runInContainer --cap-add SYS_NICE (findBuildImage) $SCRIPTSDIR/runTests.fish $argv
+    runInContainer --security-opt seccomp=unconfined --cap-add SYS_NICE (findBuildImage) $SCRIPTSDIR/runTests.fish $argv
     set s $status
   end
 
 
@@ -42,6 +42,7 @@ Else
         $global:TSHARK = ""
   }
 }
+$ENV:TSHARK=$global:TSHARK
 
 $global:HANDLE_EXE = $null
 If (Get-Command handle.exe -ErrorAction SilentlyContinue)
@@ -65,7 +66,7 @@ Else
 {
   Remove-Item "$global:COREDIR\*" -Recurse -Force
 }
-$global:RUBY = (Get-Command ruby.exe).Path
+$env:COREDIR=$global:COREDIR
 $global:INNERWORKDIR = "$WORKDIR\work"
 $global:ARANGODIR = "$INNERWORKDIR\ArangoDB"
 $global:ENTERPRISEDIR = "$global:ARANGODIR\enterprise"
@@ -191,14 +192,14 @@ Function comm
 
 Function 7zip($Path,$DestinationPath,$moreArgs)
 {
-    Write-Host "7za.exe" -argument "a -mx9 $DestinationPath $Path $moreArgs" -logfile $false -priority "Normal" 
-    proc -process "7za.exe" -argument "a -mx9 $DestinationPath $Path $moreArgs" -logfile $false -priority "Normal" 
+    Write-Host "7z.exe" -argument "a -mx9 $DestinationPath $Path $moreArgs" -logfile $false -priority "Normal" 
+    proc -process "7z.exe" -argument "a -mx9 $DestinationPath $Path $moreArgs" -logfile $false -priority "Normal" 
 }
 
 Function 7unzip($zip)
 {
-    Write-Host "7za.exe" -argument "x $zip -aoa" -logfile $false -priority "Normal" 
-    proc -process "7za.exe" -argument "x $zip -aoa" -logfile $false -priority "Normal" 
+    Write-Host "7z.exe" -argument "x $zip -aoa" -logfile $false -priority "Normal" 
+    proc -process "7z.exe" -argument "x $zip -aoa" -logfile $false -priority "Normal" 
 }
 
 Function isGCE
@@ -582,6 +583,11 @@ Function showConfig
     Write-Host "------------------------------------------------------------------------------"
     Write-Host "Cache Statistics"
     showCacheStats
+    $ENV:SKIPNONDETERMINISTIC = $SKIPNONDETERMINISTIC
+    $ENV:SKIPTIMECRITICAL = $SKIPTIMECRITICAL
+    $ENV:SKIPGREY = $SKIPGREY
+    $ENV:ONLYGREY = $ONLYGREY
+    $ENV:BUILDMODE = $BUILDMODE
     comm
 }
 
@@ -600,7 +606,7 @@ Function resilience
 Function catchtest
 {
     $global:TESTSUITE = "catchtest"
-    $global:TESTSUITE_TIMEOUT = 1800
+    $global:TIMELIMIT = 1800
 }
 If (-Not($TESTSUITE))
 {
@@ -1618,8 +1624,8 @@ Function signWindows
     Write-Host "Time: $((Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH.mm.ssZ'))"
     ForEach ($PACKAGE in $(Get-ChildItem -Filter ArangoDB3*.exe).FullName)
     {
-        Write-Host "Sign: signtool.exe sign /fd sha1 /td sha1 /sha1 D4F9266E06107CF3C29AA7E5635AD5F76018F6A3 /tr `"http://sha256timestamp.ws.symantec.com/sha256/timestamp`" `"$PACKAGE`""
-        proc -process signtool.exe -argument "sign /fd sha1 /td sha1 /sha1 D4F9266E06107CF3C29AA7E5635AD5F76018F6A3 /tr `"http://sha256timestamp.ws.symantec.com/sha256/timestamp`" `"$PACKAGE`"" -logfile "$INNERWORKDIR\$($PACKAGE.Split('\')[-1])-sign.log" -priority "Normal"
+        Write-Host "Sign: signtool.exe sign /sm /fd sha1 /td sha1 /sha1 D4F9266E06107CF3C29AA7E5635AD5F76018F6A3 /tr `"http://sha256timestamp.ws.symantec.com/sha256/timestamp`" `"$PACKAGE`""
+        proc -process signtool.exe -argument "sign /sm /fd sha1 /td sha1 /sha1 D4F9266E06107CF3C29AA7E5635AD5F76018F6A3 /tr `"http://sha256timestamp.ws.symantec.com/sha256/timestamp`" `"$PACKAGE`"" -logfile "$INNERWORKDIR\$($PACKAGE.Split('\')[-1])-sign.log" -priority "Normal"
     }
     Pop-Location
 }
 
@@ -0,0 +1,2 @@
+def attach(**kwargs):
+    return
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ Else`
`42`	`42`	`$global:TSHARK = ""`
`43`	`43`	`}`
`44`	`44`	`}`
	`45`	`+$ENV:TSHARK=$global:TSHARK`
`45`	`46`
`46`	`47`	`$global:HANDLE_EXE = $null`
`47`	`48`	`If (Get-Command handle.exe -ErrorAction SilentlyContinue)`
`@@ -65,7 +66,7 @@ Else`
`65`	`66`	`{`
`66`	`67`	`Remove-Item "$global:COREDIR\*" -Recurse -Force`
`67`	`68`	`}`
`68`		`-$global:RUBY = (Get-Command ruby.exe).Path`
	`69`	`+$env:COREDIR=$global:COREDIR`
`69`	`70`	`$global:INNERWORKDIR = "$WORKDIR\work"`
`70`	`71`	`$global:ARANGODIR = "$INNERWORKDIR\ArangoDB"`
`71`	`72`	`$global:ENTERPRISEDIR = "$global:ARANGODIR\enterprise"`
`@@ -191,14 +192,14 @@ Function comm`
`191`	`192`
`192`	`193`	`Function 7zip($Path,$DestinationPath,$moreArgs)`
`193`	`194`	`{`
`194`		`- Write-Host "7za.exe" -argument "a -mx9 $DestinationPath $Path $moreArgs" -logfile $false -priority "Normal"`
`195`		`- proc -process "7za.exe" -argument "a -mx9 $DestinationPath $Path $moreArgs" -logfile $false -priority "Normal"`
	`195`	`+ Write-Host "7z.exe" -argument "a -mx9 $DestinationPath $Path $moreArgs" -logfile $false -priority "Normal"`
	`196`	`+ proc -process "7z.exe" -argument "a -mx9 $DestinationPath $Path $moreArgs" -logfile $false -priority "Normal"`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`Function 7unzip($zip)`
`199`	`200`	`{`
`200`		`- Write-Host "7za.exe" -argument "x $zip -aoa" -logfile $false -priority "Normal"`
`201`		`- proc -process "7za.exe" -argument "x $zip -aoa" -logfile $false -priority "Normal"`
	`201`	`+ Write-Host "7z.exe" -argument "x $zip -aoa" -logfile $false -priority "Normal"`
	`202`	`+ proc -process "7z.exe" -argument "x $zip -aoa" -logfile $false -priority "Normal"`
`202`	`203`	`}`
`203`	`204`
`204`	`205`	`Function isGCE`
`@@ -582,6 +583,11 @@ Function showConfig`
`582`	`583`	`Write-Host "------------------------------------------------------------------------------"`
`583`	`584`	`Write-Host "Cache Statistics"`
`584`	`585`	`showCacheStats`
	`586`	`+ $ENV:SKIPNONDETERMINISTIC = $SKIPNONDETERMINISTIC`
	`587`	`+ $ENV:SKIPTIMECRITICAL = $SKIPTIMECRITICAL`
	`588`	`+ $ENV:SKIPGREY = $SKIPGREY`
	`589`	`+ $ENV:ONLYGREY = $ONLYGREY`
	`590`	`+ $ENV:BUILDMODE = $BUILDMODE`
`585`	`591`	`comm`
`586`	`592`	`}`
`587`	`593`
`@@ -600,7 +606,7 @@ Function resilience`
`600`	`606`	`Function catchtest`
`601`	`607`	`{`
`602`	`608`	`$global:TESTSUITE = "catchtest"`
`603`		`- $global:TESTSUITE_TIMEOUT = 1800`
	`609`	`+ $global:TIMELIMIT = 1800`
`604`	`610`	`}`
`605`	`611`	`If (-Not($TESTSUITE))`
`606`	`612`	`{`
`@@ -1618,8 +1624,8 @@ Function signWindows`
`1618`	`1624`	`Write-Host "Time: $((Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH.mm.ssZ'))"`
`1619`	`1625`	`ForEach ($PACKAGE in $(Get-ChildItem -Filter ArangoDB3*.exe).FullName)`
`1620`	`1626`	`{`
`1621`		- Write-Host "Sign: signtool.exe sign /fd sha1 /td sha1 /sha1 D4F9266E06107CF3C29AA7E5635AD5F76018F6A3 /tr `"http://sha256timestamp.ws.symantec.com/sha256/timestamp`" `"$PACKAGE`""
`1622`		- proc -process signtool.exe -argument "sign /fd sha1 /td sha1 /sha1 D4F9266E06107CF3C29AA7E5635AD5F76018F6A3 /tr `"http://sha256timestamp.ws.symantec.com/sha256/timestamp`" `"$PACKAGE`"" -logfile "$INNERWORKDIR\$($PACKAGE.Split('\')[-1])-sign.log" -priority "Normal"
	`1627`	+ Write-Host "Sign: signtool.exe sign /sm /fd sha1 /td sha1 /sha1 D4F9266E06107CF3C29AA7E5635AD5F76018F6A3 /tr `"http://sha256timestamp.ws.symantec.com/sha256/timestamp`" `"$PACKAGE`""
	`1628`	+ proc -process signtool.exe -argument "sign /sm /fd sha1 /td sha1 /sha1 D4F9266E06107CF3C29AA7E5635AD5F76018F6A3 /tr `"http://sha256timestamp.ws.symantec.com/sha256/timestamp`" `"$PACKAGE`"" -logfile "$INNERWORKDIR\$($PACKAGE.Split('\')[-1])-sign.log" -priority "Normal"
`1623`	`1629`	`}`
`1624`	`1630`	`Pop-Location`
`1625`	`1631`	`}`