From 718e605c60e21c49fd85073b8d57a9fee97b6e74 Mon Sep 17 00:00:00 2001 From: Marcin Ickiewicz Date: Fri, 16 May 2025 10:57:45 +0200 Subject: [PATCH] Restores "use AI tooling delivered by the HAF image" This reverts commit 6e11e28cbfbf67ea55be34755f07fce7c2ed89dc. --- .gitlab-ci.yml | 18 +--- Dockerfile.haf_ai | 15 ---- readme.md | 3 +- scripts/build_haf_ai_image.sh | 88 ------------------- scripts/ci-helpers/compose_variables.sh | 4 +- .../ci-helpers/start-ci-test-environment.sh | 2 +- 6 files changed, 5 insertions(+), 125 deletions(-) delete mode 100644 Dockerfile.haf_ai delete mode 100755 scripts/build_haf_ai_image.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a71d163..1de1ff7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -110,29 +110,13 @@ build_images: tags: - public-runner-docker -build_haf_ai_images: - extends: .docker_image_builder_job_template - stage: build - before_script: - - !reference [.docker_image_builder_job_template, before_script] - - | - echo -e "\e[0Ksection_start:$(date +%s):login[collapsed=true]\r\e[0KLogging to Docker registry..." - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - echo -e "\e[0Ksection_end:$(date +%s):login\r\e[0K" - script: - - $CI_PROJECT_DIR/scripts/build_haf_ai_image.sh --push - needs: - - job: prepare_haf_image - tags: - - public-runner-docker - sync: extends: .docker_image_builder_job_template stage: sync image: registry.gitlab.syncad.com/hive/haf_api_node/dind:1.27.11rc2 needs: + - prepare_haf_image - build_images - - build_haf_ai_images variables: DOCKER_COMPOSE_VERSION: 2.27.1 DATA_SOURCE: ${DATA_CACHE_HAF_PREFIX}_${HAF_COMMIT} diff --git a/Dockerfile.haf_ai b/Dockerfile.haf_ai deleted file mode 100644 index 94683bf..0000000 --- a/Dockerfile.haf_ai +++ /dev/null @@ -1,15 +0,0 @@ -ARG HAF_TAG=70974c14 -ARG REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/ -ARG NETWORK="haf" # mainnet - -FROM ${REGISTRY_IMAGE}${NETWORK}:${HAF_TAG} AS ai-instance - -SHELL ["/bin/bash", "-c"] - -USER root -WORKDIR /usr/local/src -COPY ./scripts/setup_ubuntu.sh /usr/local/src/scripts/ - -RUN bash -x ./scripts/setup_ubuntu.sh - -USER haf_admin \ No newline at end of file diff --git a/readme.md b/readme.md index fe0d81e..3208d7d 100644 --- a/readme.md +++ b/readme.md @@ -222,7 +222,7 @@ The CI pipeline includes several key steps to ensure quality, build consistency, #### Docker Image Builds - Builds Docker images based on the current submodule versions for: - - `haf ai-instance` (with AI-related tools see [`/scripts/setup_ubuntu.sh`](./scripts/setup_ubuntu.sh) used by [`Dockerfile.haf_ai`](./Dockerfile.haf_ai) ) + - `haf` - `hivemind` - `haf_api_node` - `hivesense` @@ -244,7 +244,6 @@ To reproduce CI-related issues on your local machine, you can replicate the envi 1. **Build Docker Images** ```bash - ./scripts/build_haf_ai_image.sh # Builds the HAF Docker image with AI support. Uses the HAF submodule version as the base. ./scripts/build_images.sh # Builds Docker images for hivesense and the PostgREST rewriter. ``` diff --git a/scripts/build_haf_ai_image.sh b/scripts/build_haf_ai_image.sh deleted file mode 100755 index 6ed27f7..0000000 --- a/scripts/build_haf_ai_image.sh +++ /dev/null @@ -1,88 +0,0 @@ -#! /bin/bash -x - -set -euo pipefail - -SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" -SCRIPTSDIR="$SCRIPTPATH/.." - -BUILD_IMAGE_TAG="" -NETWORK="" -SRCROOTDIR="${SCRIPTSDIR}" -REGISTRY="${CI_REGISTRY:-registry.gitlab.syncad.com}" -REGISTRY="${REGISTRY}/hive/" - -HAF_AI_INSTANCE_REGISTRY="registry.gitlab.syncad.com/hive/hivesense/haf/" - - -HAF_SUBMODULE_SHA=$(git -C submodules/haf describe --tags --exact-match HEAD 2>/dev/null || git -C submodules/haf rev-parse --short=8 HEAD) -BUILD_IMAGE_TAG=${HAF_SUBMODULE_SHA} - -print_help () { -cat <<-EOF - Usage: $0 [OPTION[=VALUE]]... - - Builds docker image containing Hived installation - OPTIONS: - --push Push built images to registry - --network-type=TYPE Allows to specify type of blockchain network supported by built hived. Allowed values: mainnet, testnet, mirrornet - --help|-h|-? Display this help screen and exit -EOF -} - -while [ $# -gt 0 ]; do - case "$1" in - --push) - PUSH=1 - ;; - --network-type=*) - type="${1#*=}" - - case $type in - "testnet"*) - NETWORK=testnet - ;; - "mirrornet"*) - NETWORK=mirrornet - ;; - "mainnet"*) - NETWORK="" - ;; - *) - echo "ERROR: '$type' is not a valid network type" - echo - exit 3 - esac - ;; - --help|-h|-?) - print_help - exit 0 - ;; - *) - if [ -z "$SRCROOTDIR" ]; - then - SRCROOTDIR="${1}" - else - echo "ERROR: '$1' is not a valid option/positional argument" - echo - print_help - exit 2 - fi - ;; - esac - shift -done - -AI_INSTANCE_IMAGE_PATH="${HAF_AI_INSTANCE_REGISTRY}${NETWORK}ai-instance:${BUILD_IMAGE_TAG}" - -docker build --progress=plain --target=ai-instance \ - --build-arg REGISTRY_IMAGE="${REGISTRY}" \ - --build-arg NETWORK="${NETWORK:-"haf"}" \ - --build-arg HAF_TAG="${BUILD_IMAGE_TAG}" \ - --tag "${AI_INSTANCE_IMAGE_PATH}" \ - --file Dockerfile.haf_ai "${SRCROOTDIR}" - -if [ -n "${PUSH:-}" ]; then - echo "Pushing image ${AI_INSTANCE_IMAGE_PATH}..." - docker push "${AI_INSTANCE_IMAGE_PATH}" - echo "Pushed image ${AI_INSTANCE_IMAGE_PATH}" -fi \ No newline at end of file diff --git a/scripts/ci-helpers/compose_variables.sh b/scripts/ci-helpers/compose_variables.sh index 1f789af..e255961 100644 --- a/scripts/ci-helpers/compose_variables.sh +++ b/scripts/ci-helpers/compose_variables.sh @@ -30,8 +30,7 @@ HIVE_API_NODE_REGISTRY="registry.gitlab.syncad.com/hive" PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME:-"localhost"} # HAF and Hivemind -HAF_IMAGE="registry.gitlab.syncad.com/hive/hivesense/haf/ai-instance" -HAF_VERSION="$HAF_SUBMODULE_SHA" +HAF_VERSION="${HAF_SUBMODULE_SHA}" ARGUMENTS="--replay-blockchain --block-stats-report-output=NOTIFY --block-stats-report-type=FULL --notifications-endpoint=hived-pme:9185 --stop-at-block=${NUMBER_OF_BLOCKS_TO_SYNC}" HIVEMIND_VERSION="$HIVEMIND_NODE_SUBMODULE_SHA" export REPUTATION_TRACKER_VERSION="${REPUTATION_TRACKER_HIVEMIND_VERSION}" @@ -45,6 +44,7 @@ HIVESENSE_REWRITER_IMAGE="registry.gitlab.syncad.com/hive/hivesense/rewiter" HIVESENSE_SYNC_ARGS="--stop-at-block=${NUMBER_OF_BLOCKS_TO_SYNC}" HIVESENSE_OLLAMA=http://hivesense-ollama:11434 +#HIVESENSE_OLLAMA=http://192.168.6.186:11434 HIVESENSE_MODEL=yxchia/multilingual-e5-base:F16 HIVESENSE_VECTOR_SIZE=768 HIVESENSE_START_BLOCK=1 diff --git a/scripts/ci-helpers/start-ci-test-environment.sh b/scripts/ci-helpers/start-ci-test-environment.sh index 4ae20d4..2c24f6e 100755 --- a/scripts/ci-helpers/start-ci-test-environment.sh +++ b/scripts/ci-helpers/start-ci-test-environment.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -x # shellcheck disable=SC1091 -- GitLab