Address merge conflicts

ORNL · Aug 29, 2024 · 04f1eae · 04f1eae
2 parents 75e33a4 + 28e5576
commit 04f1eae
Show file tree

Hide file tree

Showing 40 changed files with 665 additions and 209 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -15,6 +15,7 @@
 # Particularly if stage_clear_cache.yml contains jobs with the needs 
 # keyword that names a job in infrastructure.yml
 include:
+ - local: .gitlab/stage_pipeline_serialize.yml
  - local: .gitlab/infrastructure.yml
  - local: .gitlab/stage_clear_cache.yml
  - local: .gitlab/stage_build_base.yml
@@ -24,6 +25,7 @@ include:
  - local: .gitlab/end_to_end.yml
 
 stages:
+ - pipeline-serialize
  - ci-infrastructure-check
  - trigger-infrastructure
  - signal
@@ -48,4 +50,3 @@ variables:
  HARBOR_USER: 'robot$$datafed+harbor_datafed_gitlab_ci_registry_2'
  REGISTRY: 'camden.ornl.gov'
  DATAFED_DEPENDENCIES_INSTALL_PATH: "/shared/install"
-
diff --git a/.gitlab/build/build_core_image.yml b/.gitlab/build/build_core_image.yml
@@ -26,5 +26,11 @@ build-core:
  - .gitlab-ci.yml
  when: on_success
 
-placeholder:
- extends: .placeholder
+retag-image:
+ extends: .docker_retag_image
+ stage: build
+ variables:
+ IMAGE_TAG: "datafed/core"
+ GIT_STRATEGY: clone
+ tags:
+ - docker
diff --git a/.gitlab/build/build_foxx_image.yml b/.gitlab/build/build_foxx_image.yml
@@ -23,5 +23,11 @@ build-foxx:
  - .gitlab-ci.yml
  when: on_success
 
-placeholder:
- extends: .placeholder
+retag-image:
+ extends: .docker_retag_image
+ stage: build
+ variables:
+ IMAGE_TAG: "datafed/foxx"
+ GIT_STRATEGY: clone
+ tags:
+ - docker
diff --git a/.gitlab/build/build_gcs_base_image.yml b/.gitlab/build/build_gcs_base_image.yml
@@ -29,9 +29,28 @@ build-gcs-base:
  - source "scripts/dependency_versions.sh"
  - cd "external/globus-connect-server-deploy/docker"
  - git checkout "$DATAFED_GCS_SUBMODULE_VERSION"
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  - docker build --progress plain -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" - < "./docker-files/Dockerfile.ubuntu-20.04"
- - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+ - docker tag "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:$CI_COMMIT_SHA"
+ - export DATAFED_HARBOR_REPOSITORY="${IMAGE_TAG}-${BRANCH_LOWER}"
+ - export DATAFED_HARBOR_USERNAME="${HARBOR_USER}"
+ - export DATAFED_HARBOR_PASSWORD="${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ - |
+ while [ "$(./scripts/ci_harbor_artifact_count.sh)" == "0" ]; do
+ echo "Artifact missing from harbor..."
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ sleep 5 # Optional: Add a sleep to avoid busy waiting 
+ done
+ - cat "./harbor_check.log"
 
-placeholder:
- extends: .placeholder
+retag-image:
+ extends: .docker_retag_image
+ stage: build
+ variables:
+ IMAGE_TAG: "datafed/gcs-base"
+ GIT_STRATEGY: clone
+ tags:
+ - docker
diff --git a/.gitlab/build/build_gcs_image.yml b/.gitlab/build/build_gcs_image.yml
@@ -28,9 +28,29 @@ build-gcs:
  - BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
  - echo "$BRANCH_LOWER"
  - ./scripts/generate_datafed.sh
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  - docker build --build-arg DEPENDENCIES="${REGISTRY}/datafed/dependencies-${BRANCH_LOWER}:latest" --build-arg RUNTIME="${REGISTRY}/datafed/runtime-${BRANCH_LOWER}:latest" --build-arg GCS_IMAGE="${REGISTRY}/datafed/gcs-base-${BRANCH_LOWER}:latest" -f repository/docker/Dockerfile.gcs -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" .
- - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+ - docker tag "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:$CI_COMMIT_SHA"
+ - export DATAFED_HARBOR_REPOSITORY="${IMAGE_TAG}-${BRANCH_LOWER}"
+ - export DATAFED_HARBOR_USERNAME="${HARBOR_USER}"
+ - export DATAFED_HARBOR_PASSWORD="${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ - |
+ while [ "$(./scripts/ci_harbor_artifact_count.sh)" == "0" ]; do
+ echo "Artifact missing from harbor..."
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ sleep 5 # Optional: Add a sleep to avoid busy waiting 
+ done
+ - cat "./harbor_check.log"
 
-placeholder:
- extends: .placeholder
+retag-image:
+ extends: .docker_retag_image
+ stage: build
+ variables:
+ IMAGE_TAG: "datafed/gcs"
+ GIT_STRATEGY: clone
+ tags:
+ - ci-datafed-globus
+ - docker
diff --git a/.gitlab/build/build_repo_image.yml b/.gitlab/build/build_repo_image.yml
@@ -24,5 +24,11 @@ build-repo:
  - .gitlab-ci.yml
  when: on_success
 
-placeholder:
- extends: .placeholder
+retag-image:
+ extends: .docker_retag_image
+ stage: build
+ variables:
+ IMAGE_TAG: "datafed/repo"
+ GIT_STRATEGY: clone
+ tags:
+ - docker
diff --git a/.gitlab/build/build_ws_image.yml b/.gitlab/build/build_ws_image.yml
@@ -24,5 +24,11 @@ build-ws:
  - .gitlab-ci.yml
  when: on_success
 
-placeholder:
- extends: .placeholder
+retag-image:
+ extends: .docker_retag_image
+ stage: build
+ variables:
+ IMAGE_TAG: "datafed/ws"
+ GIT_STRATEGY: clone
+ tags:
+ - docker
diff --git a/.gitlab/build/force_build_gcs_base_image.yml b/.gitlab/build/force_build_gcs_base_image.yml
@@ -17,6 +17,19 @@ build-gcs-base:
  - source "scripts/dependency_versions.sh"
  - cd "external/globus-connect-server-deploy/docker"
  - git checkout "$DATAFED_GCS_SUBMODULE_VERSION"
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  - docker build --progress plain -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" - < "./docker-files/Dockerfile.ubuntu-20.04"
- - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+ - docker tag "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:$CI_COMMIT_SHA"
+ - export DATAFED_HARBOR_REPOSITORY="${IMAGE_TAG}-${BRANCH_LOWER}"
+ - export DATAFED_HARBOR_USERNAME="${HARBOR_USER}"
+ - export DATAFED_HARBOR_PASSWORD="${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ - |
+ while [ "$(./scripts/ci_harbor_artifact_count.sh)" == "0" ]; do
+ echo "Artifact missing from harbor..."
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ sleep 5 # Optional: Add a sleep to avoid busy waiting 
+ done
+ - cat "./harbor_check.log"
diff --git a/.gitlab/build/force_build_gcs_image.yml b/.gitlab/build/force_build_gcs_image.yml
@@ -14,6 +14,20 @@ build-gcs:
  - BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
  - echo "$BRANCH_LOWER"
  - ./scripts/generate_datafed.sh
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  - docker build --build-arg DEPENDENCIES="${REGISTRY}/datafed/dependencies-${BRANCH_LOWER}:latest" --build-arg RUNTIME="${REGISTRY}/datafed/runtime-${BRANCH_LOWER}:latest" --build-arg GCS_IMAGE="${REGISTRY}/datafed/gcs-base-${BRANCH_LOWER}:latest" -f repository/docker/Dockerfile.gcs -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" .
- - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+ - docker tag "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:$CI_COMMIT_SHA"
+ - export DATAFED_HARBOR_REPOSITORY="${IMAGE_TAG}-${BRANCH_LOWER}"
+ - export DATAFED_HARBOR_USERNAME="${HARBOR_USER}"
+ - export DATAFED_HARBOR_PASSWORD="${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ - |
+ while [ "$(./scripts/ci_harbor_artifact_count.sh)" == "0" ]; do
+ echo "Artifact missing from harbor..."
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ sleep 5 # Optional: Add a sleep to avoid busy waiting 
+ done
+ - cat "./harbor_check.log"
+
diff --git a/.gitlab/common.yml b/.gitlab/common.yml
@@ -6,7 +6,7 @@
  script:
  - |
  BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
- docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  FORCE_BUILD="FALSE"
  set +e
  docker pull --quiet "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest"
@@ -20,31 +20,74 @@
  fi
  echo "REGISTRY=${REGISTRY}" >> build.env
  echo "HARBOR_USER=${HARBOR_USER}" >> build.env
- echo "HARBOR_DATAFED_GITLAB_CI_REGISTRY=${HARBOR_DATAFED_GITLAB_CI_REGISTRY}" >> build.env
+ echo "HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN=${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}" >> build.env
  sed -i 's/\(HARBOR_USER=.*\)\$/\1$$/g' build.env
  artifacts:
  paths:
  - ${COMPONENT}_image.yml 
  reports:
  dotenv: build.env
 
-
+# NOTE
+#
+# Cases have been observed where an image has been pushed to the image registry but 
+# but the image for some reason is not registered with the Harbor instance. The
+# retry loop is used to retry pushing to the registry to add some resliency to the
+# ci pipeline in the case of poor networking issues while attempting to upload
 .docker_base_build_script:
  script:
  - BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
  - docker system prune -f
  - docker build -f "${DOCKER_FILE_PATH}" -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" .
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
- - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest"
+ - docker tag "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:$CI_COMMIT_SHA"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
+ - export DATAFED_HARBOR_REPOSITORY="${IMAGE_TAG}-${BRANCH_LOWER}"
+ - export DATAFED_HARBOR_USERNAME="${HARBOR_USER}"
+ - export DATAFED_HARBOR_PASSWORD="${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ - |
+ first_iteration="TRUE"
+ while [ "$(./scripts/ci_harbor_artifact_count.sh)" == "0" ]; do
+ echo "Artifact missing from harbor..."
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ if [ "$first_iteration" == "FALSE" ]
+ then
+ sleep 5 # Optional: Add a sleep to avoid busy waiting 
+ else
+ first_iteration="FALSE"
+ fi
+ done
+ - cat "./harbor_check.log"
 
 .docker_build_script:
  script:
  - BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
  - echo "$BRANCH_LOWER"
  - ./scripts/generate_datafed.sh
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  - docker build --build-arg DEPENDENCIES="${REGISTRY}/datafed/dependencies-${BRANCH_LOWER}:latest" --build-arg RUNTIME="${REGISTRY}/datafed/runtime-${BRANCH_LOWER}:latest" -f ${DOCKER_FILE_PATH} -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" .
- - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+ - docker tag "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:$CI_COMMIT_SHA"
+ - export DATAFED_HARBOR_REPOSITORY="${IMAGE_TAG}-${BRANCH_LOWER}"
+ - export DATAFED_HARBOR_USERNAME="${HARBOR_USER}"
+ - export DATAFED_HARBOR_PASSWORD="${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ - |
+ first_iteration="TRUE"
+ while [ "$(./scripts/ci_harbor_artifact_count.sh)" == "0" ]; do
+ echo "Artifact missing from harbor..."
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ if [ "$first_iteration" == "FALSE" ]
+ then
+ sleep 5 # Optional: Add a sleep to avoid busy waiting 
+ else
+ first_iteration="FALSE"
+ fi
+ done
+ - cat "./harbor_check.log"
 
 .error_logs_client_end_to_end:
  stage: log
@@ -54,23 +97,31 @@
  rules:
  - when: always
 
-
-
-# Prevents downstream pipeline from being empty and triggering a failure, the
-# build-ws job above may or may not run because of the rules section, if there
-# are no jobs in the pipeline GitLab has the unfortunate behavior of reporting
-# the trigger as a failure. To prevent the pipeline from being empty the
-# placeholder job is created. 
-# 
-# There are open proposals addressing this issue that have not yet been finished.
-# Possibly in the future a "stragetgy: mirror" option could be used to mimic the
-# status of the downstream pipeline in the trigger job. See discussion here:
-#
-# https://gitlab.com/group.gitlab-org/-/epics/11447#proposal
-
-.placeholder:
- stage: build
- tags:
- - docker
+# In the case that we are not needing to actually rebuild the image we want to retag the image that already exists
+# in harbor with the current commit, this is so that when we are running tests that are dependent on the container
+# we know that it is the right container.
+.docker_retag_image:
  script:
- - echo "placeholder"
+ - BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
+ - export DATAFED_HARBOR_REPOSITORY="${IMAGE_TAG}-${BRANCH_LOWER}"
+ - export DATAFED_HARBOR_IMAGE_TAG=${CI_COMMIT_SHA}
+ - export DATAFED_HARBOR_USERNAME="${HARBOR_USER}"
+ - export DATAFED_HARBOR_PASSWORD="${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
+ - echo "$BRANCH_LOWER"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
+ - docker pull "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest"
+ - docker tag "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:latest" "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ - docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ - |
+ first_iteration="TRUE"
+ while [ "$(./scripts/ci_harbor_artifact_count.sh)" == "0" ]; do
+ echo "Artifact missing from harbor..."
+ docker push "${REGISTRY}/${DATAFED_HARBOR_REPOSITORY}:$CI_COMMIT_SHA"
+ if [ "$first_iteration" == "FALSE" ]
+ then
+ sleep 5 # Optional: Add a sleep to avoid busy waiting 
+ else
+ first_iteration="FALSE"
+ fi
+ done
+ - cat "./harbor_check.log"
diff --git a/.gitlab/end_to_end.yml b/.gitlab/end_to_end.yml
@@ -38,7 +38,7 @@ end-to-end-foxx-setup:
  - mkdir foxx_tmp
  - ls -la foxx_tmp
  - if [ -f foxx_tmp/.foxx_is_installed ]; then rm foxx_tmp/.foxx_is_installed; fi
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  - ./scripts/container_stop.sh -n "foxx-" -p
  - random_string=$(bash -c "cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w "10" | head -n 1")
  - echo "#!/bin/bash" > "${RUN_FILE}"
@@ -90,7 +90,7 @@ end-to-end-core-setup:
  - echo "$BRANCH_LOWER"
  - ./scripts/generate_datafed.sh
  - env > env_file
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  - ./scripts/container_stop.sh -n "core-" -p
  - ./scripts/ci_database_health_check.sh
  - cat $CI_DATAFED_CORE_PUB_KEY > /shared/keys/datafed-core-key.pub
@@ -145,7 +145,7 @@ end-to-end-ws-setup:
  - chmod o+w "${HOST_LOG_FILE_PATH}"
  - chown gitlab-runner "$HOST_LOG_FILE_PATH"
  - ./scripts/generate_datafed.sh
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  - USER_ID=$(id -u)
  - GROUP_ID=$(id -g)
  - CORE_ADDRESS=$(hostname -I | awk '{print $1}')
@@ -201,7 +201,7 @@ end-to-end-repo-setup:
  - USER_ID=$(id -u)
  - chown gitlab-runner "$HOST_LOG_FILE_PATH"
  - ./scripts/generate_datafed.sh
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  - ./scripts/container_stop.sh -n "repo-" -p
  - random_string=$(bash -c "cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w "10" | head -n 1")
  - cat $CI_DATAFED_CORE_PUB_KEY > /shared/datafed-repo-key.pub
@@ -263,7 +263,7 @@ end-to-end-gcs-authz-setup:
  - chmod o+w "${HOST_LOG_FILE_PATH}"
  - chown gitlab-runner "$HOST_LOG_FILE_PATH"
  - ./scripts/generate_datafed.sh
- - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+ - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
  - ./scripts/container_stop.sh -n "gcs-authz" -p
  - random_string=$(bash -c "cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w "10" | head -n 1")
  - cat $CI_DATAFED_CORE_PUB_KEY > /shared/datafed-repo-key.pub