From d342bebeca86642a9bdaba569dc4627196c367ce Mon Sep 17 00:00:00 2001
From: Dmytro Bogatov <dmytro@dbogatov.org>
Date: Fri, 11 Aug 2017 00:50:15 +0300
Subject: [PATCH] Fix.
---
.gitlab-ci.yml | 104 +++++++++++-----------
client/ts/modules/metric-page/abstract.ts | 7 --
2 files changed, 52 insertions(+), 59 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15cec78..11718a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,61 +51,61 @@ build-app:
## TEST
-# unit-test-app:
-# stage: test
-# image: microsoft/dotnet:1.1.1-sdk
-# script:
-# - printf "{\"Version\":{\"GitHash\":\"%s\"}}" $CI_BUILD_REF > src/version.json
-# - cd test
-# - dotnet restore
-# - ./test.sh | tee tests.out
-# - "cat tests.out | grep 'Failed: 0.'"
-# tags:
-# - docker
+unit-test-app:
+ stage: test
+ image: microsoft/dotnet:1.1.1-sdk
+ script:
+ - printf "{\"Version\":{\"GitHash\":\"%s\"}}" $CI_BUILD_REF > src/version.json
+ - cd test
+ - dotnet restore
+ - ./test.sh | tee tests.out
+ - "cat tests.out | grep 'Failed: 0.'"
+ tags:
+ - docker
-# tidy-app:
-# stage: test
-# image: dbogatov/docker-containers:dotnet-core-latest
-# dependencies:
-# - build-app
-# before_script:
-# - export ASPNETCORE_ENVIRONMENT="Staging"
-# - cd src/web/bin/release/netcoreapp1.1/publish/
-# - dotnet web.dll > /dev/null &
-# - sleep 15
-# script:
-# - curl -Ls http://localhost:5555/ | tidy -e
-# - curl -Ls http://localhost:5555/home/metric/CpuLoad/the-source | tidy -e
-# tags:
-# - docker
+tidy-app:
+ stage: test
+ image: dbogatov/docker-containers:dotnet-core-latest
+ dependencies:
+ - build-app
+ before_script:
+ - export ASPNETCORE_ENVIRONMENT="Staging"
+ - cd src/web/bin/release/netcoreapp1.1/publish/
+ - dotnet web.dll > /dev/null &
+ - sleep 15
+ script:
+ - curl -Ls http://localhost:5555/ | tidy -e
+ - curl -Ls http://localhost:5555/home/metric/CpuLoad/the-source | tidy -e
+ tags:
+ - docker
-# blc-app:
-# stage: test
-# image: dbogatov/docker-containers:dotnet-core-latest
-# dependencies:
-# - build-app
-# before_script:
-# - export ASPNETCORE_ENVIRONMENT="Staging"
-# - cd src/web/bin/release/netcoreapp1.1/publish/
-# - dotnet web.dll > /dev/null &
-# - sleep 15
-# script:
-# - blc --filter-level 3 --input http://localhost:5555 -rog --exclude "*linkedin.*" --exclude "*authenticate*"
-# tags:
-# - docker
+blc-app:
+ stage: test
+ image: dbogatov/docker-containers:dotnet-core-latest
+ dependencies:
+ - build-app
+ before_script:
+ - export ASPNETCORE_ENVIRONMENT="Staging"
+ - cd src/web/bin/release/netcoreapp1.1/publish/
+ - dotnet web.dll > /dev/null &
+ - sleep 15
+ script:
+ - blc --filter-level 3 --input http://localhost:5555 -rog --exclude "*linkedin.*" --exclude "*authenticate*"
+ tags:
+ - docker
-# blc-docs:
-# stage: test
-# image: dbogatov/docker-containers:jekyll-latest
-# dependencies:
-# - build-docs
-# before_script:
-# - http-server documentation/out/ -p 8080 > /dev/null &
-# - sleep 5
-# script:
-# - blc --filter-level 3 --input http://localhost:8080 -rog --exclude "*linkedin.*" --exclude "*doxygen.*" --exclude "*status.dbogatov.org*"
-# tags:
-# - docker
+blc-docs:
+ stage: test
+ image: dbogatov/docker-containers:jekyll-latest
+ dependencies:
+ - build-docs
+ before_script:
+ - http-server documentation/out/ -p 8080 > /dev/null &
+ - sleep 5
+ script:
+ - blc --filter-level 3 --input http://localhost:8080 -rog --exclude "*linkedin.*" --exclude "*doxygen.*" --exclude "*status.dbogatov.org*"
+ tags:
+ - docker
## RELEASE
diff --git a/client/ts/modules/metric-page/abstract.ts b/client/ts/modules/metric-page/abstract.ts
index 775a45f..657dfd0 100644
--- a/client/ts/modules/metric-page/abstract.ts
+++ b/client/ts/modules/metric-page/abstract.ts
@@ -204,13 +204,6 @@ export abstract class MetricPage<T extends Metric<DataPoint>> {
}
}
- // console.log("from: " + from);
- // console.log("to: " + to);
- // console.log("maxData: " + this.maxData);
- // console.log("minData: " + this.minData);
- // console.log("start: " + this.start);
- // console.log("end: " + this.end);
-
plot.setSelection({ xaxis: { from: from, to: to }, yaxis: { from: 0, to: 0 } });
} else {
// if latest data point is more than 2 hours ago
--
GitLab