diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 7276b0a45..b2797844c 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -342,24 +342,12 @@ run go tests dax/test/dax: paths: - coverage-dax-integration.out -.idk_changed: - rules: - - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' - changes: - compare_to: refs/heads/master - paths: - - idk/** - - client/** - - batch/** - # idk tests run go tests idk race: variables: PROJECT: race_${CI_CONCURRENT_ID} stage: nonblocking retry: 1 - rules: - - !reference [.idk_changed, rules] script: - echo "Running test-all-race" - cd ./idk/ @@ -385,8 +373,6 @@ run go tests idk shard transactional: PROJECT: shardttrans_${CI_CONCURRENT_ID} stage: nonblocking retry: 1 - rules: - - !reference [.idk_changed, rules] script: - echo "Running shard transactional tests" - cd ./idk/ @@ -423,8 +409,6 @@ run go tests idk 533: - cd ./idk/ - make save-pilosa-logs - make shutdown - rules: - - !reference [.idk_changed, rules] tags: - shell - aws @@ -449,8 +433,6 @@ run go tests idk sasl: - cd ./idk/ - make save-pilosa-logs - make shutdown - rules: - - !reference [.idk_changed, rules] tags: - shell - aws diff --git a/idk/Makefile b/idk/Makefile index 8c520af2d..cf4c9a0bf 100644 --- a/idk/Makefile +++ b/idk/Makefile @@ -153,11 +153,11 @@ start-all: testenv build-wait echo "branch name" ${BRANCH_NAME} $(DOCKER_COMPOSE) up -d zookeeper $(DOCKER_COMPOSE) run -T wait zookeeper 'echo "ruok" | nc -w 2 zookeeper 2181 | grep imok' - $(DOCKER_COMPOSE) up -d dax $(DOCKER_COMPOSE) up -d kafka $(DOCKER_COMPOSE) up -d schema-registry $(DOCKER_COMPOSE) up -d postgres $(DOCKER_COMPOSE) run -T wait postgres pg_isready -h postgres -p 5432 -U postgres + $(DOCKER_COMPOSE) up -d dax BRANCH_NAME=${BRANCH_NAME} $(DOCKER_COMPOSE) up -d pilosa BRANCH_NAME=${BRANCH_NAME} $(DOCKER_COMPOSE) up -d pilosa-tls BRANCH_NAME=${BRANCH_NAME} $(DOCKER_COMPOSE) up -d pilosa-auth diff --git a/idk/docker-compose.yml b/idk/docker-compose.yml index bc22c7581..388fb3519 100644 --- a/idk/docker-compose.yml +++ b/idk/docker-compose.yml @@ -142,8 +142,19 @@ services: FEATUREBASE_VERBOSE: "true" FEATUREBASE_QUERYER_RUN: "true" FEATUREBASE_CONTROLLER_RUN: "true" - FEATUREBASE_CONTROLLER_CONFIG_DATA_DIR: /dax-data/controller + FEATUREBASE_CONTROLLER_CONFIG_STORAGE_METHOD: "sqldb" + FEATUREBASE_CONTROLLER_CONFIG_SQLDB_DATABASE: "postgres" + FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER: "postgres" + FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD: "password" + FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST: "postgres" + SQLDB_DB: "postgres" + SQLDB_USER: "postgres" + SQLDB_PASSWORD: "password" + SQLDB_HOST: "postgres" FEATUREBASE_COMPUTER_RUN: "true" FEATUREBASE_COMPUTER_CONFIG_DATA_DIR: /dax-data/computer FEATUREBASE_COMPUTER_CONFIG_WRITELOGGER_DIR: /dax-data/wl FEATUREBASE_COMPUTER_CONFIG_SNAPSHOTTER_DIR: /dax-data/snaps + depends_on: + - postgres +