Skip to content

Commit

Permalink
Core and web should be working
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoshuaSBrown
JoshuaSBrown committed May 18, 2024
1 parent de33cef commit 1968ef1
Showing 1 changed file with 110 additions and 53 deletions.
163 changes: 110 additions & 53 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,60 +323,117 @@ end-to-end-arango-setup:
- arangod --version
- ./scripts/run_arango_service.sh

#################################################################################
## STAGE: End to end setup
#################################################################################
#
#end-to-end-core-setup:
# variables:
# IMAGE_TAG: "datafed/core-"
# GIT_STRATEGY: clone
# HOST_LOG_FILE_PATH: "/shared/logs"
# CONTAINER_LOG_FILE_PATH: "/datafed/logs"
# DATAFED_DATABASE_HOST: "$CI_DATAFED_DATABASE_HOST"
# stage: end-to-end-setup
# needs: ["end-to-end-arango-setup"]
# tags:
# - ci-datafed-core
# - docker
# script:
# - BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
# - mkdir -p "$HOST_LOG_FILE_PATH"
# - chmod o+w "${HOST_LOG_FILE_PATH}"
# - USER_ID=$(id -u)
# - chown gitlab-runner "$HOST_LOG_FILE_PATH"
# - echo "$BRANCH_LOWER"
# - ./scripts/generate_datafed.sh
# - env > env_file
################################################################################
# STAGE: End to end setup
################################################################################

# - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
# - ./scripts/container_stop.sh -t "${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}"
# - ./scripts/ci_database_health_check.sh
# - cat $CI_DATAFED_CORE_PUB_KEY > /shared/datafed-core-key.pub
# - cat $CI_DATAFED_CORE_PRIV_KEY > /shared/datafed-core-key.priv
# - random_string=$(bash -c "cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w "10" | head -n 1")
# - echo "#!/bin/bash" > run_core.sh
# - echo "docker run -d \\" >> run_core.sh
# - echo "--name \"core-${BRANCH_LOWER}-${CI_COMMIT_SHORT_SHA}-${random_string}\" \\" >> run_core.sh
# - echo "-e DATAFED_GLOBUS_APP_SECRET=\"$CI_DATAFED_GLOBUS_APP_SECRET\" \\" >> run_core.sh
# - echo "-e DATAFED_GLOBUS_APP_ID=\"$CI_DATAFED_GLOBUS_APP_ID\" \\" >> run_core.sh
# - echo "-e DATAFED_ZEROMQ_SESSION_SECRET=\"$CI_DATAFED_ZEROMQ_SESSION_SECRET\" \\" >> run_core.sh
# - echo "-e DATAFED_ZEROMQ_SYSTEM_SECRET=\"$CI_DATAFED_ZEROMQ_SYSTEM_SECRET\" \\" >> run_core.sh
# - echo "-e DATAFED_DOMAIN=\"$CI_DATAFED_DOMAIN\" \\" >> run_core.sh
# - echo "-e DATAFED_DATABASE_PASSWORD=\"$CI_DATAFED_DATABASE_PASSWORD\" \\" >> run_core.sh
# - echo "-e DATAFED_DATABASE_IP_ADDRESS_PORT=\"$CI_DATAFED_DATABASE_IP_ADDRESS_PORT\" \\" >> run_core.sh
# - echo "-e DATAFED_DEFAULT_LOG_PATH=\"$CONTAINER_LOG_FILE_PATH\" \\" >> run_core.sh
# - echo "-e UID=\"$USER_ID\" \\" >> run_core.sh
# - echo "-p 7513:7513 \\" >> run_core.sh
# - echo "-p 7512:7512 \\" >> run_core.sh
# - echo "-v \"${HOST_LOG_FILE_PATH}:${CONTAINER_LOG_FILE_PATH}\" \\" >> run_core.sh
# - echo "-v \"/shared/datafed-core-key.pub\":/datafed/install/keys/datafed-core-key.pub \\" >> run_core.sh
# - echo "-v \"/shared/datafed-core-key.priv\":/datafed/install/keys/datafed-core-key.priv \\" >> run_core.sh
# - echo "-t \"${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}\"" >> run_core.sh
# - chmod +x run_core.sh
# - ./run_core.sh
# - sleep 10
# - ./scripts/container_run_test.sh -e -c "1" -t "${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}"
end-to-end-core-setup:
variables:
IMAGE_TAG: "datafed/core-"
GIT_STRATEGY: clone
HOST_LOG_FILE_PATH: "/shared/logs"
CONTAINER_LOG_FILE_PATH: "/datafed/logs"
DATAFED_DATABASE_HOST: "$CI_DATAFED_DATABASE_HOST"
stage: end-to-end-setup
needs: ["end-to-end-arango-setup"]
tags:
- ci-datafed-core
- docker
script:
- BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
- mkdir -p "$HOST_LOG_FILE_PATH"
- chmod o+w "${HOST_LOG_FILE_PATH}"
- USER_ID=$(id -u)
- chown gitlab-runner "$HOST_LOG_FILE_PATH"
- echo "$BRANCH_LOWER"
- ./scripts/generate_datafed.sh
- env > env_file
- docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
- ./scripts/container_stop.sh -t "${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}"
- ./scripts/ci_database_health_check.sh
- cat $CI_DATAFED_CORE_PUB_KEY > /shared/datafed-core-key.pub
- cat $CI_DATAFED_CORE_PRIV_KEY > /shared/datafed-core-key.priv
- random_string=$(bash -c "cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w "10" | head -n 1")
- echo "#!/bin/bash" > run_core.sh
- echo "docker run -d \\" >> run_core.sh
- echo "--name \"core-${BRANCH_LOWER}-${CI_COMMIT_SHORT_SHA}-${random_string}\" \\" >> run_core.sh
- echo "-e DATAFED_GLOBUS_APP_SECRET=\"$CI_DATAFED_GLOBUS_APP_SECRET\" \\" >> run_core.sh
- echo "-e DATAFED_GLOBUS_APP_ID=\"$CI_DATAFED_GLOBUS_APP_ID\" \\" >> run_core.sh
- echo "-e DATAFED_ZEROMQ_SESSION_SECRET=\"$CI_DATAFED_ZEROMQ_SESSION_SECRET\" \\" >> run_core.sh
- echo "-e DATAFED_ZEROMQ_SYSTEM_SECRET=\"$CI_DATAFED_ZEROMQ_SYSTEM_SECRET\" \\" >> run_core.sh
- echo "-e DATAFED_DOMAIN=\"$CI_DATAFED_DOMAIN\" \\" >> run_core.sh
- echo "-e DATAFED_DATABASE_PASSWORD=\"$CI_DATAFED_DATABASE_PASSWORD\" \\" >> run_core.sh
- echo "-e DATAFED_DATABASE_IP_ADDRESS_PORT=\"$CI_DATAFED_DATABASE_IP_ADDRESS_PORT\" \\" >> run_core.sh
- echo "-e DATAFED_DEFAULT_LOG_PATH=\"$CONTAINER_LOG_FILE_PATH\" \\" >> run_core.sh
- echo "-e UID=\"$USER_ID\" \\" >> run_core.sh
- echo "-p 7513:7513 \\" >> run_core.sh
- echo "-p 7512:7512 \\" >> run_core.sh
- echo "-v \"${HOST_LOG_FILE_PATH}:${CONTAINER_LOG_FILE_PATH}\" \\" >> run_core.sh
- echo "-v \"/shared/datafed-core-key.pub\":/datafed/install/keys/datafed-core-key.pub \\" >> run_core.sh
- echo "-v \"/shared/datafed-core-key.priv\":/datafed/install/keys/datafed-core-key.priv \\" >> run_core.sh
- echo "-t \"${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}\"" >> run_core.sh
- chmod +x run_core.sh
- ./run_core.sh
- sleep 10
- ./scripts/container_run_test.sh -e -c "1" -t "${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}"

end-to-end-ws-setup:
variables:
IMAGE_TAG: "datafed/ws-"
GIT_STRATEGY: clone
HOST_LOG_FILE_PATH: "/shared/logs"
CONTAINER_LOG_FILE_PATH: "/datafed/logs"
DATAFED_WEB_KEY_DIR: "/shared/keys"
DATAFED_WEB_CERT_NAME: "cert.crt"
DATAFED_WEB_KEY_NAME: "cert.key"
DATAFED_WEB_CERT_PATH: "${DATAFED_WEB_KEY_DIR}/${DATAFED_WEB_CERT_NAME}"
DATAFED_WEB_CSR_PATH: "${DATAFED_WEB_KEY_DIR}/cert.csr"
DATAFED_WEB_KEY_PATH: "${DATAFED_WEB_KEY_DIR}/${DATAFED_WEB_KEY_NAME}"
stage: end-to-end-setup
needs: ["end-to-end-core-setup"]
tags:
- ci-datafed-core
- docker
script:
- BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
- echo "$BRANCH_LOWER"
- mkdir -p "$HOST_LOG_FILE_PATH"
- mkdir -p "${DATAFED_WEB_KEY_DIR}"
- ./scripts/ci_setup_web_certs.sh
- 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}"
- USER_ID=$(id -u)
- GROUP_ID=$(id -g)
- CORE_ADDRESS=$(hostname -I | awk '{print $1}')
- cat $CI_DATAFED_CORE_PUB_KEY > /shared/datafed-core-key.pub
- env
- ./scripts/container_stop.sh -t "${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}"
- random_string=$(bash -c "cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w "10" | head -n 1")
- echo "#!/bin/bash" > run_web.sh
- echo "docker run -d \\" >> run_web.sh
- echo "--name \"ws-${BRANCH_LOWER}-${CI_COMMIT_SHORT_SHA}-${random_string}\" \\" >> run_web.sh
- echo "-e DATAFED_GLOBUS_APP_SECRET=\"$CI_DATAFED_GLOBUS_APP_SECRET\" \\" >> run_web.sh
- echo "-e DATAFED_GLOBUS_APP_ID=\"$CI_DATAFED_GLOBUS_APP_ID\" \\" >> run_web.sh
- echo "-e DATAFED_ZEROMQ_SESSION_SECRET=\"$CI_DATAFED_ZEROMQ_SESSION_SECRET\" \\" >> run_web.sh
- echo "-e DATAFED_ZEROMQ_SYSTEM_SECRET=\"$CI_DATAFED_ZEROMQ_SYSTEM_SECRET\" \\" >> run_web.sh
- echo "-e DATAFED_DOMAIN=\"$CI_DATAFED_DOMAIN\" \\" >> run_web.sh
- echo "-e DATAFED_WEB_CERT_PATH=\"/datafed/install/keys/${DATAFED_WEB_CERT_NAME}\" \\" >> run_web.sh
- echo "-e DATAFED_WEB_KEY_PATH=\"/datafed/install/keys/${DATAFED_WEB_KEY_NAME}\" \\" >> run_web.sh
- echo "-e DATAFED_DEFAULT_LOG_PATH=\"${CONTAINER_LOG_FILE_PATH}\" \\" >> run_web.sh
- echo "-e DATAFED_CORE_ADDRESS_PORT_INTERNAL=\"$CORE_ADDRESS:7513\" \\" >> run_web.sh
- echo "-e UID=\"$USER_ID\" \\" >> run_web.sh
- echo "-p 443:443 \\" >> run_web.sh
- echo "-v \"${HOST_LOG_FILE_PATH}:${CONTAINER_LOG_FILE_PATH}\" \\" >> run_web.sh
- echo "-v \"/shared/datafed-core-key.pub:/datafed/install/keys/datafed-core-key.pub\" \\" >> run_web.sh
- echo "-v \"${DATAFED_WEB_CERT_PATH}:/datafed/install/keys/${DATAFED_WEB_CERT_NAME}\" \\" >> run_web.sh
- echo "-v \"${DATAFED_WEB_KEY_PATH}:/datafed/install/keys/${DATAFED_WEB_KEY_NAME}\" \\" >> run_web.sh
- echo "-t \"${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}\" " >> run_web.sh
- chmod +x run_web.sh
- ./run_web.sh
- sleep 30
- ./scripts/container_run_test.sh -e -c "1" -t "${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}"


#################################################################################
Expand Down

0 comments on commit 1968ef1

Please sign in to comment.