diff --git a/.gitlab/common.yml b/.gitlab/common.yml index 4508d6c8..9344a2b0 100644 --- a/.gitlab/common.yml +++ b/.gitlab/common.yml @@ -93,7 +93,7 @@ stage: log script: - BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]') - - docker logs $(docker ps --filter "ancestor=${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}" --format "{{.Names}}") + - docker logs $(docker -a ps --filter "ancestor=${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}" --format "{{.Names}}") rules: - when: always diff --git a/.gitlab/end_to_end.yml b/.gitlab/end_to_end.yml index 3f3af1fa..14ef9099 100644 --- a/.gitlab/end_to_end.yml +++ b/.gitlab/end_to_end.yml @@ -84,6 +84,9 @@ end-to-end-gcs-node-clean: - ci-datafed-globus - docker script: + - mkdir -p "${DATAFED_GLOBUS_DIR}" + - cp "${CI_DATAFED_GCS_DEPLOYMENT_KEY}" "${DATAFED_GLOBUS_DIR}/deployment-key.json" + - cp "${CI_DATAFED_GCS_CLIENT_CRED}" "${DATAFED_GLOBUS_DIR}/client_cred.json" - cat "${DATAFED_GLOBUS_DIR}/deployment-key.json" | jq .node_key > "${DATAFED_GLOBUS_DIR}/node_deletion_key.json" - SECRET=$(cat "${DATAFED_GLOBUS_DIR}/deployment-key.json" | jq -r .secret) - CLIENT=$(cat "${DATAFED_GLOBUS_DIR}/deployment-key.json" | jq -r .client_id)