Merge branch '61-reproducibility' into 'master'

Resolve "Reproducibility"

Closes #61

See merge request !56

.dockerignore

-# Ignore everything
-**
-
-# Allow these files and directories
-!/data
-!/src/cli/dist

.editorconfig

@@ -3,7 +3,7 @@ indent_style = tab
 indent_size = 4
 end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.yml]

.gitlab-ci.yml

@@ -11,6 +11,18 @@ variables:
   DOTNET_SDK_IMAGE: "dbogatov/docker-sources:microsoft-dotnet-2.2-sdk-alpine"
   DOTNET_RUNTIME_IMAGE: "dbogatov/docker-sources:microsoft-dotnet-2.2-runtime-alpine"
 
+build-reproducibility:
+  stage: release
+  script:
+  - docker build -t dbogatov/ore-benchmark:repro -f ./tools/reproducibility/Dockerfile --build-arg CI_BUILD_REF .
+  - docker login -u $DOCKER_USER -p $DOCKER_PASS
+  - docker push dbogatov/ore-benchmark:repro
+  dependencies: []
+  tags:
+  - shell
+  only:
+  - master
+
 build-docs:
   image: dbogatov/docker-sources:tsgkadot-docker-docfx
   stage: pre-build
@@ -53,7 +65,6 @@ build-app:
     - ./tools/data-gen/generate.sh
     - ./tools/simulation/
     - ./Dockerfile
-    - ./.dockerignore
     - ./src/web/Dockerfile
   tags:
   - docker
@@ -69,9 +80,6 @@ build-tests:
     paths:
     - ./test/dist
     - ./test/test.csproj
-  only:
-  - merge_requests
-  - master
   tags:
   - docker
 
@@ -123,9 +131,6 @@ unit-tests:
       junit: ./unit.xml
     paths:
       - coverage-html/
-  only:
-  - merge_requests
-  - master
   tags:
   - docker
   - heavy
@@ -146,9 +151,6 @@ integration-tests:
       junit: ./integration.xml
   dependencies:
   - build-tests
-  only:
-  - merge_requests
-  - master
   tags:
   - docker
 
@@ -167,9 +169,6 @@ system-protocol-tests:
       - ./results/protocol.json
   dependencies:
   - build-app
-  only:
-  - merge_requests
-  - master
   tags:
   - docker
 
@@ -188,9 +187,6 @@ system-schemes-tests:
       - ./results/schemes.json
   dependencies:
   - build-app
-  only:
-  - merge_requests
-  - master
   tags:
   - docker
 
@@ -204,7 +200,6 @@ published-packages-tests:
   dependencies:
   - build-app
   only:
-  - merge_requests
   - master
   tags:
   - docker

Dockerfile

-FROM dbogatov/docker-sources:microsoft-dotnet-2.1-runtime-alpine
+FROM dbogatov/docker-sources:microsoft-dotnet-2.2-runtime-alpine
 
 LABEL maintainer="dmytro@dbogatov.org"
 

tools/data-gen/Program.cs

@@ -164,7 +164,7 @@ namespace DataGen
 
 						var engine = new FileHelperAsyncEngine<Employee>();
 
-						Log("Prcessing file...");
+						Log("Processing file...");
 
 						using (engine.BeginReadString(responseString))
 						{
@@ -186,7 +186,7 @@ namespace DataGen
 							}
 						}
 
-						Log("Prcessing specific data points...");
+						Log("Processing specific data points...");
 
 						foreach (var index in set)
 						{
@@ -212,7 +212,7 @@ namespace DataGen
 
 						var engine = new FileHelperAsyncEngine<Forest>();
 
-						Log("Prcessing file...");
+						Log("Processing file...");
 
 						using (engine.BeginReadString(responseString))
 						{
@@ -234,7 +234,7 @@ namespace DataGen
 							}
 						}
 
-						Log("Prcessing specific data points...");
+						Log("Processing specific data points...");
 
 						foreach (var index in set)
 						{

tools/reproducibility/Dockerfile

+FROM dbogatov/docker-sources:microsoft-dotnet-2.2-sdk-alpine
+
+LABEL maintainer="dmytro@dbogatov.org"
+
+ARG CI_BUILD_REF
+ENV CI_BUILD_REF=$CI_BUILD_REF
+
+WORKDIR /benchmark
+
+# the context MUST be the entire repo
+COPY . .
+
+RUN \
+	apk --update add bash && \
+	./tools/reproducibility/build.sh
+
+WORKDIR /benchmark/scripts

tools/reproducibility/benchmarks.sh

+#!/usr/bin/env bash
+
+set -e
+shopt -s globstar
+
+cd /benchmark/src/benchmark/
+
+dotnet run -- $@

tools/reproducibility/build.sh

+#!/usr/bin/env bash
+
+set -e
+shopt -s globstar
+
+cd /benchmark
+
+if [ -z "$CI_BUILD_REF" ]
+then
+	CI_BUILD_REF="dev"
+fi
+
+printf "namespace CLI { public partial class Version { public override string ToString() => \"%s\"; } }" $(echo $CI_BUILD_REF | cut -c1-8) > ./src/cli/Version.cs
+
+dotnet restore src/cli/ --disable-parallel
+dotnet restore src/benchmark/ --disable-parallel
+dotnet restore tools/data-gen/ --disable-parallel
+
+dotnet publish -c release src/cli/ -o dist/
+dotnet build -c release src/benchmark/
+dotnet build -c release tools/data-gen/
+
+./tools/data-gen/generate.sh -d 2500 -q 50 -s 1305
+
+mkdir -p ./scripts/
+cp ./tools/reproducibility/{benchmarks,simulations,generate}.sh ./scripts/

tools/reproducibility/generate.sh

+#!/usr/bin/env bash
+
+set -e
+shopt -s globstar
+
+/benchmark/tools/data-gen/generate.sh $@

tools/reproducibility/simulations.sh

+#!/usr/bin/env bash
+
+set -e
+shopt -s globstar
+
+cd /benchmark/
+
+dotnet ./src/cli/dist/cli.dll $@