Skip to content

Commit

Permalink
Merge pull request #1318 from glogiotatidis/issue-1317-jupyter-cleanup
Browse files Browse the repository at this point in the history
[Issue #1317] Remove Jupyter pipeline.
  • Loading branch information
glogiotatidis committed Feb 17, 2020
2 parents 7a5551e + c8e259a commit 5c3c1e4
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 17 deletions.
9 changes: 0 additions & 9 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
variables:
DOCKER_REPOSITORY: "mozorg/snippets"
DOCKER_IMAGE_TAG: "${DOCKER_REPOSITORY}:${CI_COMMIT_SHORT_SHA}"
JUPYTER_IMAGE_TAG: "${DOCKER_REPOSITORY}:jupyter-${CI_COMMIT_SHORT_SHA}"
# Cannot use $DOCKER_IMAGE_TAG because it contains other variables itself.
DOCKER_RUN_CMD: "docker run --env-file .docker-env ${DOCKER_REPOSITORY}:${CI_COMMIT_SHORT_SHA}"

Expand All @@ -18,14 +17,6 @@ build-images:
- docker build -t ${DOCKER_IMAGE_TAG} --build-arg GIT_SHA=${CI_COMMIT_SHA} --pull .
- docker push ${DOCKER_IMAGE_TAG}

build-jupyter:
stage: build
tags:
- meao
script:
- docker build -t ${JUPYTER_IMAGE_TAG} --build-arg DEVELOPMENT=true .
- docker push ${JUPYTER_IMAGE_TAG}

.test-stage:
stage: test
variables:
Expand Down
5 changes: 0 additions & 5 deletions bin/update-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ for CLUSTER in ${CLUSTERS}; do
git add ${DEPLOYMENT_FILE}
fi
done
DEPLOYMENT_FILE=${CLUSTER}/${NAMESPACE}/jupyter-deploy.yaml
if [[ -f ${DEPLOYMENT_FILE} && -n "{JUPYTER_IMAGE_TAG}" ]]; then
sed -i -e "s|image: .*|image: ${JUPYTER_IMAGE_TAG}|" ${DEPLOYMENT_FILE}
git add ${DEPLOYMENT_FILE}
fi
done

cp ${BIN_DIR}/acceptance-tests.sh .
Expand Down
3 changes: 0 additions & 3 deletions snippets/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,4 @@

USE_PREGEN_BUNDLES = config('USE_PREGEN_BUNDLES', default=False, cast=bool)

NOTEBOOK_ARGUMENTS = ['--ip', '0.0.0.0']


NIGHTLY_INCLUDES_RELEASE = config('NIGHTLY_INCLUDES_RELEASE', default=False, cast=bool)

0 comments on commit 5c3c1e4

Please sign in to comment.