From c949d5a0fc66cd032a76733497b40c2301aeb93d Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Sat, 14 Jul 2018 17:19:32 +0200
Subject: [PATCH] =?UTF-8?q?[enh]=20ci:=20split=20the=20tests=20into=203=20?=
=?UTF-8?q?parts:=20unit,=20sync=20=C4=9E1,=20sync=20=C4=9ETest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 33 ++++++++++++++++-----------------
.gitlab/test/check_indexes.sh | 2 +-
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 753a6e3e8..da53186b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,14 +33,17 @@ push_to_github:
before_script:
- export NVM_DIR="$HOME/.nvm"
- . "$NVM_DIR/nvm.sh"
-
-build:
- <<: *nvm_env
- stage: build
+
+.cached: &cached
cache:
untracked: true
paths:
- node_modules/
+
+build:
+ <<: *nvm_env
+ <<: *cached
+ stage: build
script:
- yarn
@@ -70,16 +73,12 @@ pages:
test:
<<: *nvm_env
+ <<: *cached
stage: test
- cache:
- untracked: true
- paths:
- - node_modules/
script:
- yarn test
# Clean the dump directory before testing
- rm -rf /tmp/duniter_ci_dump/
- - mkdir -p /tmp/duniter_ci_dump/
# Code coverage display in GitLab
- tar cvzf coverage.tar.gz coverage/
- sed -n 23p coverage/index.html | grep -Po "\d+.\d+" | sed -e "s/\(.*\)/<coverage>\1%<\/coverage>/"
@@ -89,18 +88,18 @@ test:
- coverage.tar.gz
expire_in: 4h
-test_sync:
+sync_g1:
<<: *nvm_env
+ <<: *cached
stage: test
- cache:
- untracked: true
- paths:
- - node_modules/
script:
- # Clean the dump directory before testing
- - rm -rf /tmp/duniter_ci_dump/
- - mkdir -p /tmp/duniter_ci_dump/
- bash .gitlab/test/check_g1_sync.sh
+
+sync_gtest:
+ <<: *nvm_env
+ <<: *cached
+ stage: test
+ script:
- bash .gitlab/test/check_gt_sync.sh
.build_releases: &build_releases
diff --git a/.gitlab/test/check_indexes.sh b/.gitlab/test/check_indexes.sh
index 2285a57c5..b4b103ea7 100755
--- a/.gitlab/test/check_indexes.sh
+++ b/.gitlab/test/check_indexes.sh
@@ -3,8 +3,8 @@
ORIGIN_DIR=`pwd`
mkdir -p $1
DUMP_DIR=`cd $1 && pwd`
-ARCHIVES="$DUMP_DIR/archives"
CURRENCY=$2
+ARCHIVES="$DUMP_DIR/archives_$CURRENCY"
DB_TEST="gitlab_ci_sync_test_$CURRENCY"
G1_TARGET_BLOCK=$3 # This is a fixed block# which determines to the sha1 hashes
G1_IINDEX_CS=$4
--
GitLab