From 63368d5e037e3568a0078eaf37a7ea55bee6611b Mon Sep 17 00:00:00 2001 From: Seebs Date: Fri, 24 Mar 2023 13:58:57 -0500 Subject: [PATCH] export git SHA commit for IDK tests This is a sanity-check after a weird CI failure; we want to ensure that we're actually getting the expected version of featurebase. The environment variable here is magic to the IDK tests. --- .gitlab/.gitlab-ci.yml | 8 ++++---- idk/docker-compose.yml | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index c76a22872..bb2b091e7 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -353,7 +353,7 @@ run go tests idk race: - cd ./idk/ - echo $PROJECT - echo $CI_COMMIT_REF_SLUG - - BRANCH_NAME=${CI_COMMIT_REF_SLUG} make test-all-race + - BRANCH_NAME=${CI_COMMIT_REF_SLUG} IDK_FEATUREBASE_HASH=${CI_COMMIT_SHA} make test-all-race after_script: - cd ./idk/ - make save-pilosa-logs @@ -378,7 +378,7 @@ run go tests idk shard transactional: - cd ./idk/ - echo $PROJECT - echo $CI_COMMIT_REF_SLUG - - BRANCH_NAME=${CI_COMMIT_REF_SLUG} make test-all + - BRANCH_NAME=${CI_COMMIT_REF_SLUG} IDK_FEATUREBASE_HASH=${CI_COMMIT_SHA} make test-all after_script: - cd ./idk/ - make save-pilosa-logs @@ -404,7 +404,7 @@ run go tests idk 533: - cd ./idk/ - echo $PROJECT - echo $CI_COMMIT_REF_SLUG - - CONFLUENT_VERSION=5.3.3 BRANCH_NAME=${CI_COMMIT_REF_SLUG} make test-all + - CONFLUENT_VERSION=5.3.3 BRANCH_NAME=${CI_COMMIT_REF_SLUG} IDK_FEATUREBASE_HASH=${CI_COMMIT_SHA} make test-all after_script: - cd ./idk/ - make save-pilosa-logs @@ -428,7 +428,7 @@ run go tests idk sasl: - cd ./idk/ - echo $PROJECT - echo $CI_COMMIT_REF_SLUG - - BRANCH_NAME=${CI_COMMIT_REF_SLUG} make test-all-kafka-sasl + - BRANCH_NAME=${CI_COMMIT_REF_SLUG} IDK_FEATUREBASE_HASH=${CI_COMMIT_SHA} make test-all-kafka-sasl after_script: - cd ./idk/ - make save-pilosa-logs diff --git a/idk/docker-compose.yml b/idk/docker-compose.yml index 45035a54b..87348df07 100644 --- a/idk/docker-compose.yml +++ b/idk/docker-compose.yml @@ -120,6 +120,7 @@ services: dockerfile: ./idk/Dockerfile-test environment: IDK_DEFAULT_SHARD_TRANSACTIONAL: ${IDK_DEFAULT_SHARD_TRANSACTIONAL} + IDK_FEATUREBASE_HASH: ${IDK_FEATUREBASE_HASH} volumes: - ./testenv/certs:/certs - ./docker-sasl/ssl_keys:/ssl_keys