Skip to content

Commit

Permalink
[Test] Read mkp tools image from manifest docker file (#2900)
Browse files Browse the repository at this point in the history
* Add mkp deployment for test

* Add mkp deployment script

This commit adds mkp deployment script including cluster deployment,
argo installation and kfp mkp deployment.

* Add sleep 60 after kfp deployment

This commits adds sleep 60 after kfp deployment to make sure kfp
resources are ready when running argo submit.

* Typo fix
This commit fixes zone variable and deletes extra comments.

* Remove cluster deployment and argo installation in mkp script

This commit removes cluster deployment and argo installation in mkp
script. Those logic are the same with before and can use existing
script.

* Revert unrelated changes

This commit reverts unrelated changes on
test/manifests/kustomization.yaml.

* Add kfp deployment options param in post submit script

This commit adds kfp deployment options in post submit script. Current
options are standalone and mkp deployment.

* Remove WI set up on mkp deployment

This commit removes WI set up on mkp deployment.

* Fix on naming and syntax

This commit fixes small naming and syntax problem pointed on PR review.

* Read marketplace tools image from dockerfile

This commit changes marketplace tool image name from hard-coded to be
read from manifest.
  • Loading branch information
rui5i authored and k8s-ci-robot committed Jan 22, 2020
1 parent 16c2d4e commit f00be85
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions test/deploy-pipeline-mkp-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,19 @@ export APP_INSTANCE_NAME=kubeflow-pipelines-test

# Install mpdev
BIN_FILE="$HOME/bin/mpdev"
KFP_MANIFEST_DIR=${DIR}/../manifests/gcp_marketplace

if ! which mpdev; then
echo "Install mpdev"
docker pull gcr.io/cloud-marketplace-tools/k8s/dev
mkdir -p $HOME/bin/
touch $BIN_FILE
export PATH=$HOME/bin:$PATH
docker run gcr.io/cloud-marketplace-staging/marketplace-k8s-app-tools/k8s/dev:remove-ui-ownerrefs cat /scripts/dev > "$BIN_FILE"
MKP_TOOLS_IMAGE=`grep -i "FROM" ${KFP_MANIFEST_DIR}/deployer/Dockerfile | sed 's/FROM //'`
docker run ${MKP_TOOLS_IMAGE} cat /scripts/dev > "$BIN_FILE"
chmod +x "$BIN_FILE"
fi

export MARKETPLACE_TOOLS_TAG=remove-ui-ownerrefs
export MARKETPLACE_TOOLS_IMAGE=gcr.io/cloud-marketplace-staging/marketplace-k8s-app-tools/k8s/dev

KFP_MANIFEST_DIR=${DIR}/../manifests/gcp_marketplace
pushd ${KFP_MANIFEST_DIR}
# Update the version value on schema.yaml and application.yaml
sed -ri 's/publishedVersion:.*/publishedVersion: '"$GCR_IMAGE_TAG"'/' schema.yaml
Expand Down

0 comments on commit f00be85

Please sign in to comment.