From 0e28063764508abdd977ea37fd0ac0c7dd5e9507 Mon Sep 17 00:00:00 2001 From: Bartek Wrona Date: Tue, 17 Jun 2025 20:54:35 +0200 Subject: [PATCH 1/4] Updated ccc reference, reused app deployment templates. --- .gitlab-ci.yml | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 557a9e316..0d45e7346 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: variables: # Variables required by Common CI jobs - CI_COMMON_JOB_VERSION: 'e74d7109838ff05fdc239bced6a726aa7ad46a9b' + CI_COMMON_JOB_VERSION: '5748d218bce6541d4c7f932fbe65f8ef46a3df45' DOCKER_BUILDER_TAG: '$CI_COMMON_JOB_VERSION' DOCKER_DIND_TAG: '$CI_COMMON_JOB_VERSION' IMAGE_REMOVER_TAG: '$CI_COMMON_JOB_VERSION' @@ -43,7 +43,7 @@ variables: include: - template: Workflows/Branch-Pipelines.gitlab-ci.yml - project: 'hive/common-ci-configuration' - ref: e74d7109838ff05fdc239bced6a726aa7ad46a9b # develop + ref: 5748d218bce6541d4c7f932fbe65f8ef46a3df45 # develop file: - '/templates/docker_image_jobs.gitlab-ci.yml' - '/templates/cache_cleanup.gitlab-ci.yml' @@ -542,28 +542,8 @@ publish: - public-runner-docker .deploy_template: - extends: .job-defaults + extends: .webapp_deploy_template # ccc template stage: deploy - 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: - - | - # credits of solution for gitlab bug: https://gitlab.com/gitlab-org/gitlab/-/issues/294292#note_1070210709 - export DEPLOYMENT_ENV_FILE=${!DEPLOYMENT_ENV_FILE} - # Make visible all vars in the bash env - source "${DEPLOYMENT_ENV_FILE}" - - scripts/run_instance.sh \ - --image="$IMAGE_NAME" \ - --name="$CONTAINER_NAME" \ - --port=$PORT \ - --env-file="${DEPLOYMENT_ENV_FILE}" \ - --detach - tags: - - hs-denser # Main branch deployments (manual) main:deploy-blog-mainnet: @@ -648,16 +628,8 @@ main:deploy-wallet-mirrornet: # Stop jobs template .stop_template: - extends: .job-defaults + extends: .webapp_stop_template stage: cleanup - script: - - docker ps -q --filter "name=$CONTAINER_NAME" | grep -q . && docker stop $CONTAINER_NAME - rules: - - if: $CI_PIPELINE_SOURCE == "web" - when: manual - allow_failure: true - tags: - - hs-denser # Stop jobs for main deployments main:stop-blog-mainnet: -- GitLab From 579311b556e8a7aa28c36ec7388cc6d4f7758006 Mon Sep 17 00:00:00 2001 From: Bartek Wrona Date: Wed, 18 Jun 2025 15:18:41 +0200 Subject: [PATCH 2/4] Reverted accidently merged change. --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d45e7346..0a26e0b95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -705,7 +705,7 @@ develop:deploy-blog-mainnet: IMAGE_NAME: $BLOG_IMAGE_NAME DEPLOYMENT_ENV_FILE: "MAINNET_DEV_DEPLOYMENT_ENV" rules: - - if: $CI_COMMIT_BRANCH == "bw_eliminate_private_secrets" + - if: $CI_COMMIT_BRANCH == "develop" environment: name: develop-blog-mainnet url: https://blog.dev.openhive.network @@ -739,7 +739,7 @@ develop:deploy-blog-mirrornet: IMAGE_NAME: $BLOG_IMAGE_NAME DEPLOYMENT_ENV_FILE: "MIRRORNET_DEV_DEPLOYMENT_ENV" rules: - - if: $CI_COMMIT_BRANCH == "bw_eliminate_private_secrets" + - if: $CI_COMMIT_BRANCH == "develop" environment: name: develop-blog-mirrornet url: https://blog.dev.fake.openhive.network @@ -772,7 +772,7 @@ develop:stop-blog-mainnet: variables: CONTAINER_NAME: denser-dev-blog rules: - - if: $CI_COMMIT_BRANCH == "bw_eliminate_private_secrets" + - if: $CI_COMMIT_BRANCH == "develop" when: manual allow_failure: true environment: -- GitLab From 690b449f043232580e36400e9602fe20aa4428f4 Mon Sep 17 00:00:00 2001 From: Bartek Wrona Date: Wed, 18 Jun 2025 15:41:01 +0200 Subject: [PATCH 3/4] Updated haf reference to avoid conflict to ccc --- .gitlab-ci.yml | 2 +- haf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a26e0b95..242d2aa04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ include: - '/templates/docker_image_jobs.gitlab-ci.yml' - '/templates/cache_cleanup.gitlab-ci.yml' - project: 'hive/haf' - ref: b7870f229cc0d45993a648ab9a15b0b4a12e7fe5 #develop + ref: b88fc925427d1f0e7ff01fcc09efcde4e51e4c0c #develop file: '/scripts/ci-helpers/prepare_data_image_job.yml' - project: 'hive/haf_api_node' ref: denser-11 diff --git a/haf b/haf index 40a77e182..b88fc9254 160000 --- a/haf +++ b/haf @@ -1 +1 @@ -Subproject commit 40a77e182a3a00af18479755d5eb43d8b76070d8 +Subproject commit b88fc925427d1f0e7ff01fcc09efcde4e51e4c0c -- GitLab From fc49f8f36e8bd68276c4a03ed149b89f1fd7247b Mon Sep 17 00:00:00 2001 From: Bartek Wrona Date: Wed, 18 Jun 2025 23:23:48 +0200 Subject: [PATCH 4/4] Updated BLOCK_LOG variable version to match to the referenced hive version. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 242d2aa04..2bc597583 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ variables: API_NODE_TAG: 'denser-11' HAF_IMAGE_REGISTRY: 'registry.gitlab.syncad.com/hive/haf/mirrornet-instance' HAF_IMAGE_NAME: '${HAF_IMAGE_REGISTRY}:${API_NODE_VERSION}' - BLOCK_LOG_VERSION: 'f8a89045' + BLOCK_LOG_VERSION: 'c63425ca' # warning: this version must match to the hived submodule referenced from underlying haf. # BLOCK_LOG_SOURCE_DIR: "/blockchain/block_log_mirror_44" REPLAY_DIRECTORY_PREFIX: '/cache/replay_data_denser_haf_api_node' REPLAY_DIRECTORY: '${REPLAY_DIRECTORY_PREFIX}_${API_NODE_TAG}_${API_NODE_VERSION}_${BLOCK_LOG_VERSION}' -- GitLab