From 80951882e566fa27ccaa80a4cbac3226b312ab67 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Sat, 14 Jul 2018 15:23:27 +0200
Subject: [PATCH] =?UTF-8?q?[enh]=20ci:=20check=20sync=20against=20=C4=9ETe?=
=?UTF-8?q?st=20as=20well?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 3 ++-
.gitlab/test/check_g1_sync.sh | 9 +++++++++
.gitlab/test/check_gt_sync.sh | 9 +++++++++
.gitlab/test/check_indexes.sh | 25 +++++++++++++------------
4 files changed, 33 insertions(+), 13 deletions(-)
create mode 100755 .gitlab/test/check_g1_sync.sh
create mode 100755 .gitlab/test/check_gt_sync.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cda16665..e0b0139ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,8 @@ test:
# Clean the dump directory before testing
- rm -rf /tmp/duniter_ci_dump/
- mkdir -p /tmp/duniter_ci_dump/
- #- bash .gitlab/test/check_indexes.sh /tmp/duniter_ci_dump/
+ - bash .gitlab/test/check_g1_sync.sh
+ - bash .gitlab/test/check_gt_sync.sh
# 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>/"
diff --git a/.gitlab/test/check_g1_sync.sh b/.gitlab/test/check_g1_sync.sh
new file mode 100755
index 000000000..52f0e8e52
--- /dev/null
+++ b/.gitlab/test/check_g1_sync.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+G1_TARGET_BLOCK=132446 # This is a fixed block# which determines to the sha1 hashes
+G1_IINDEX_CS=26393b64cdb9abb8e4012d6914f475635cba4c60
+G1_MINDEX_CS=7c5f07c7705647365b8965fcfc5a084c2f82a388
+G1_CINDEX_CS=3803c1ed8d3dd8f31558666d8dfd30272a6d0b74
+G1_SINDEX_CS=551bdba1855d5c49cd503fcb8ad787b2a24c2c42
+
+.gitlab/test/check_indexes.sh /tmp/duniter_ci_dump/ g1 ${G1_TARGET_BLOCK} ${G1_IINDEX_CS} ${G1_MINDEX_CS} ${G1_CINDEX_CS} ${G1_SINDEX_CS}
diff --git a/.gitlab/test/check_gt_sync.sh b/.gitlab/test/check_gt_sync.sh
new file mode 100755
index 000000000..b2c187f8d
--- /dev/null
+++ b/.gitlab/test/check_gt_sync.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+GT_TARGET_BLOCK=210000 # This is a fixed block# which determines to the sha1 hashes
+GT_IINDEX_CS=dfd2dfc3d4d0ced4c101badb4d4a1ab85de8cbde
+GT_MINDEX_CS=9d8f665f5fcf1f21082278c4787bb3df085ff109
+GT_CINDEX_CS=b141361fb40f4c13f03f4640151c7674e190a4dd
+GT_SINDEX_CS=7c6801027e39b9fea9be973d8773ac77d2c9a1f9
+
+.gitlab/test/check_indexes.sh /tmp/duniter_ci_dump/ gt ${GT_TARGET_BLOCK} ${GT_IINDEX_CS} ${GT_MINDEX_CS} ${GT_CINDEX_CS} ${GT_SINDEX_CS}
diff --git a/.gitlab/test/check_indexes.sh b/.gitlab/test/check_indexes.sh
index 12d2ea8a3..2285a57c5 100755
--- a/.gitlab/test/check_indexes.sh
+++ b/.gitlab/test/check_indexes.sh
@@ -1,15 +1,16 @@
#!/usr/bin/env bash
ORIGIN_DIR=`pwd`
+mkdir -p $1
DUMP_DIR=`cd $1 && pwd`
ARCHIVES="$DUMP_DIR/archives"
-DB_TEST_G1="gitlab_ci_sync_test_g1"
-DB_TEST_GT="gitlab_ci_sync_test_gt"
-G1_TARGET_BLOCK=132446 # This is a fixed block# which determines to the sha1 hashes
-G1_IINDEX_CS=26393b64cdb9abb8e4012d6914f475635cba4c60
-G1_MINDEX_CS=7c5f07c7705647365b8965fcfc5a084c2f82a388
-G1_CINDEX_CS=3803c1ed8d3dd8f31558666d8dfd30272a6d0b74
-G1_SINDEX_CS=551bdba1855d5c49cd503fcb8ad787b2a24c2c42
+CURRENCY=$2
+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
+G1_MINDEX_CS=$5
+G1_CINDEX_CS=$6
+G1_SINDEX_CS=$7
checksum_test() {
local table=$1
@@ -53,8 +54,8 @@ echo "Positionnement dans $ORIGIN_DIR"
cd ${ORIGIN_DIR}
-sync_data ${DB_TEST_G1} "$ARCHIVES/g1" ${G1_TARGET_BLOCK}
-checksum_test i_index ${G1_IINDEX_CS} ${DB_TEST_G1}
-checksum_test m_index ${G1_MINDEX_CS} ${DB_TEST_G1}
-checksum_test c_index ${G1_CINDEX_CS} ${DB_TEST_G1}
-checksum_test s_index ${G1_SINDEX_CS} ${DB_TEST_G1}
+sync_data ${DB_TEST} "$ARCHIVES/$CURRENCY" ${G1_TARGET_BLOCK}
+checksum_test i_index ${G1_IINDEX_CS} ${DB_TEST}
+checksum_test m_index ${G1_MINDEX_CS} ${DB_TEST}
+checksum_test c_index ${G1_CINDEX_CS} ${DB_TEST}
+checksum_test s_index ${G1_SINDEX_CS} ${DB_TEST}
--
GitLab