Merge pull request opendatahub-io#48 from gmfrasca/fix-ci

test: Update CI tests to work with renamed repository

Author: anishasthana

tests/Dockerfile

@@ -27,7 +27,7 @@ RUN curl -o /usr/local/bin/jq http://stedolan.github.io/jq/download/linux64/jq &
 
 RUN mkdir -p $HOME/src && \
     cd $HOME/src && \
-    git clone --depth=1 --branch ${BRANCH} https://github.com/${ORG}/ml-pipelines && \
+    git clone --depth=1 --branch ${BRANCH} https://github.com/${ORG}/data-science-ipelines && \
     # Clone ods-ci repo at specified git ref for the JupyterHub webUI tests
     git clone --depth=1 ${ODS_CI_REPO} ods-ci && cd ods-ci && \
     git fetch origin ${ODS_CI_GITREF} && git checkout FETCH_HEAD && \
@@ -50,10 +50,10 @@ RUN pip3 install micropipenv &&\
     micropipenv install
 
 COPY setup/operatorsetup scripts/install.sh scripts/installandtest.sh $HOME/peak/
-COPY resources $HOME/peak/operator-tests/ml-pipelines/resources
-COPY util $HOME/peak/operator-tests/ml-pipelines
+COPY resources $HOME/peak/operator-tests/data-science-pipelines/resources
+COPY util $HOME/peak/operator-tests/data-science-pipelines
 COPY setup/kfctl_openshift.yaml $HOME/kfdef/
-COPY basictests $HOME/peak/operator-tests/ml-pipelines/basictests
+COPY basictests $HOME/peak/operator-tests/data-science-pipelines/basictests
 
 RUN chmod -R 777 $HOME/kfdef && \
     mkdir -p $HOME/.kube && \

tests/Makefile

@@ -1,4 +1,4 @@
-IMAGE=ml-pipelines-tests
+IMAGE=data-science-pipelines-tests
 GIT_ORG=opendatahub-io
 GIT_BRANCH=master
 ODHPROJECT=opendatahub

tests/basictests/ml-pipelines.sh renamed to tests/basictests/ds-pipelines.sh

@@ -10,27 +10,27 @@ RESOURCEDIR="${MY_DIR}/../resources"
 os::test::junit::declare_suite_start "$MY_SCRIPT"
 
 function check_resources() {
-    header "Testing ML pipelines installation"
+    header "Testing Data Science Pipelines installation"
     os::cmd::expect_success "oc project ${ODHPROJECT}"
     os::cmd::try_until_text "oc get crd pipelineruns.tekton.dev " "pipelineruns.tekton.dev" $odhdefaulttimeout $odhdefaultinterval
-    os::cmd::try_until_text "oc get pods -l application-crd-id=kubeflow-pipelines --field-selector='status.phase!=Running,status.phase!=Completed' -o jsonpath='{$.items[*].metadata.name}' | wc -w" "0" $odhdefaulttimeout $odhdefaultinterval
-    running_pods=$(oc get pods -l application-crd-id=kubeflow-pipelines --field-selector='status.phase=Running' -o jsonpath='{$.items[*].metadata.name}' | wc -w)
+    os::cmd::try_until_text "oc get pods -l application-crd-id=data-science-pipelines --field-selector='status.phase!=Running,status.phase!=Completed' -o jsonpath='{$.items[*].metadata.name}' | wc -w" "0" $odhdefaulttimeout $odhdefaultinterval
+    running_pods=$(oc get pods -l application-crd-id=data-science-pipelines --field-selector='status.phase=Running' -o jsonpath='{$.items[*].metadata.name}' | wc -w)
     os::cmd::expect_success "if [ "$running_pods" -gt "0" ]; then exit 0; else exit 1; fi"
 }
 
 function check_ui_overlay() {
     header "Checking UI overlay Kfdef deploys the UI"
-    os::cmd::try_until_text "oc get pods -l app=ml-pipeline-ui --field-selector='status.phase=Running' -o jsonpath='{$.items[*].metadata.name}' | wc -w" "1" $odhdefaulttimeout $odhdefaultinterval
+    os::cmd::try_until_text "oc get pods -l app=ds-pipeline-ui --field-selector='status.phase=Running' -o jsonpath='{$.items[*].metadata.name}' | wc -w" "1" $odhdefaulttimeout $odhdefaultinterval
 }
 
 function create_pipeline() {
     header "Creating a pipeline"
-    route=`oc get route ml-pipeline || echo ""`
+    route=`oc get route ds-pipeline || echo ""`
     if [[ -z $route ]]; then
-        oc expose service ml-pipeline
+        oc expose service ds-pipeline
     fi
-    ROUTE=$(oc get route ml-pipeline --template={{.spec.host}})
-    PIPELINE_ID=$(curl -s -F "uploadfile=@${RESOURCEDIR}/ml-pipelines/test-pipeline-run.yaml" ${ROUTE}/apis/v1beta1/pipelines/upload | jq -r .id)
+    ROUTE=$(oc get route ds-pipeline --template={{.spec.host}})
+    PIPELINE_ID=$(curl -s -F "uploadfile=@${RESOURCEDIR}/ds-pipelines/test-pipeline-run.yaml" ${ROUTE}/apis/v1beta1/pipelines/upload | jq -r .id)
     os::cmd::try_until_not_text "curl -s ${ROUTE}/apis/v1beta1/pipelines/${PIPELINE_ID} | jq" "null" $odhdefaulttimeout $odhdefaultinterval
 }
 
@@ -57,7 +57,7 @@ function check_run_status() {
 
 function setup_monitoring() {
     header "Enabling User Workload Monitoring on the cluster"
-    oc apply -f ${RESOURCEDIR}/ml-pipelines/enable-uwm.yaml
+    oc apply -f ${RESOURCEDIR}/ds-pipelines/enable-uwm.yaml
 }
 
 function test_metrics() {
@@ -94,6 +94,6 @@ setup_monitoring
 test_metrics
 delete_runs
 delete_pipeline
-oc delete route ml-pipeline
+oc delete route ds-pipeline
 
 os::test::junit::declare_suite_end

tests/resources/ml-pipelines/enable-uwm.yaml renamed to tests/resources/ds-pipelines/enable-uwm.yaml

@@ -20,16 +20,16 @@ spec:
     name: openshift-pipelines
   - kustomizeConfig:
       overlays:
-        - metadata-store-mysql
-        - ml-pipeline-ui
+        - metadata-store-mariadb
+        - ds-pipeline-ui
         - object-store-minio
       repoRef:
         name: app
         path: manifests/opendatahub
-    name: ml-pipelines
+    name: data-science-pipelines
   repos:
   - name: manifests
     uri: https://github.com/opendatahub-io/odh-manifests/tarball/master
   - name: app
-    uri: https://github.com/opendatahub-io/ml-pipelines/tarball/master
+    uri: https://github.com/opendatahub-io/data-science-pipelines/tarball/master
   version: master