feat: Patch to fix running condition (#895)

* feat: Patch to fix running condition Signed-off-by: Ce Gao <gaoce@caicloud.io> * chore: Add job dir Signed-off-by: Ce Gao <gaoce@caicloud.io> * fix: Remove CI for suggestion Signed-off-by: Ce Gao <gaoce@caicloud.io> * fix: Remove tag Signed-off-by: Ce Gao <gaoce@caicloud.io>
kubeflow · Oct 25, 2019 · 818b879 · 818b879
1 parent 7443f02
commit 818b879
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 15 deletions.
diff --git a/pkg/job/v1alpha3/job/job.go b/pkg/job/v1alpha3/job/job.go
@@ -1,8 +1,6 @@
 package job
 
 import (
-	"fmt"
-
 	commonv1 "github.com/kubeflow/tf-operator/pkg/apis/common/v1"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -30,9 +28,9 @@ func (j Job) GetDeployedJobStatus(
 			log.Error(unerr, "NestedFieldCopy unstructured to status error")
 			return nil, unerr
 		}
-		err := fmt.Errorf("value is missing")
-		log.Error(err, "NestedFieldCopy unstructured to status error")
-		return nil, err
+		log.Info("NestedFieldCopy unstructured to status error",
+			"err", "Status is not found in job")
+		return &jobCondition, nil
 	}
 
 	statusMap := status.(map[string]interface{})

diff --git a/pkg/job/v1alpha3/kubeflow/kubeflow.go b/pkg/job/v1alpha3/kubeflow/kubeflow.go
@@ -1,8 +1,6 @@
 package kubeflow
 
 import (
-	"fmt"
-
 	pytorchv1 "github.com/kubeflow/pytorch-operator/pkg/apis/pytorch/v1"
 	commonv1 "github.com/kubeflow/tf-operator/pkg/apis/common/v1"
 	tfv1 "github.com/kubeflow/tf-operator/pkg/apis/tensorflow/v1"
@@ -36,9 +34,9 @@ func (k Kubeflow) GetDeployedJobStatus(
 			log.Error(unerr, "NestedFieldCopy unstructured to status error")
 			return nil, unerr
 		}
-		err := fmt.Errorf("value is missing")
-		log.Error(err, "NestedFieldCopy unstructured to status error")
-		return nil, err
+		log.Info("NestedFieldCopy unstructured to status error",
+			"err", "Status is not found in job")
+		return &jobCondition, nil
 	}
 
 	statusMap := status.(map[string]interface{})

diff --git a/prow_config.yaml b/prow_config.yaml
@@ -103,6 +103,7 @@ workflows:
     - pkg/earlystopping/v1alpha3/*
     - pkg/manager/v1alpha3/*
     - pkg/manager/modelstore/*
+    - pkg/job/v1alpha3/*
     - pkg/suggestion/v1alpha3/*
     - pkg/ui/v1alpha3/*
     - pkg/webhook/v1alpha3/*
@@ -147,6 +148,7 @@ workflows:
     - pkg/earlystopping/v1alpha3/*
     - pkg/manager/v1alpha3/*
     - pkg/manager/modelstore/*
+    - pkg/job/v1alpha3/*
     - pkg/suggestion/v1alpha3/*
     - pkg/ui/v1alpha3/*
     - pkg/webhook/v1alpha3/*

diff --git a/test/scripts/v1alpha3/build-suggestion-chocolate.sh b/test/scripts/v1alpha3/build-suggestion-chocolate.sh
@@ -20,6 +20,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+exit 0
+
 export PATH=${GOPATH}/bin:/usr/local/go/bin:${PATH}
 REGISTRY="${GCP_REGISTRY}"
 PROJECT="${GCP_PROJECT}"

diff --git a/test/scripts/v1alpha3/build-suggestion-hyperband.sh b/test/scripts/v1alpha3/build-suggestion-hyperband.sh
@@ -20,6 +20,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+exit 0
+
 export PATH=${GOPATH}/bin:/usr/local/go/bin:${PATH}
 REGISTRY="${GCP_REGISTRY}"
 PROJECT="${GCP_PROJECT}"

diff --git a/test/scripts/v1alpha3/build-suggestion-hyperopt.sh b/test/scripts/v1alpha3/build-suggestion-hyperopt.sh
@@ -20,6 +20,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+exit 0
+
 export PATH=${GOPATH}/bin:/usr/local/go/bin:${PATH}
 REGISTRY="${GCP_REGISTRY}"
 PROJECT="${GCP_PROJECT}"

diff --git a/test/scripts/v1alpha3/build-suggestion-nasrl.sh b/test/scripts/v1alpha3/build-suggestion-nasrl.sh
@@ -20,6 +20,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+exit 0
+
 export PATH=${GOPATH}/bin:/usr/local/go/bin:${PATH}
 REGISTRY="${GCP_REGISTRY}"
 PROJECT="${GCP_PROJECT}"

diff --git a/test/scripts/v1alpha3/build-suggestion-skopt.sh b/test/scripts/v1alpha3/build-suggestion-skopt.sh
@@ -20,6 +20,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+exit 0
+
 export PATH=${GOPATH}/bin:/usr/local/go/bin:${PATH}
 REGISTRY="${GCP_REGISTRY}"
 PROJECT="${GCP_PROJECT}"

diff --git a/test/scripts/v1alpha3/check-katib-ready.sh b/test/scripts/v1alpha3/check-katib-ready.sh
@@ -79,11 +79,11 @@ sed -i -e "s@image: gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/katib-manag
 sed -i -e "s@image: gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/katib-ui@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha3\/katib-ui:${VERSION}@" manifests/v1alpha3/ui/deployment.yaml
 
 # Suggestion algorithms
-sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/suggestion-nasrl@${REGISTRY}\/${REPO_NAME}\/v1alpha3\/suggestion-nasrl:${VERSION}@" manifests/v1alpha3/katib-controller/katib-config.yaml
-sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/suggestion-hyperband@${REGISTRY}\/${REPO_NAME}\/v1alpha3\/suggestion-hyperband:${VERSION}@" manifests/v1alpha3/katib-controller/katib-config.yaml
-sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/suggestion-chocolate@${REGISTRY}\/${REPO_NAME}\/v1alpha3\/suggestion-chocolate:${VERSION}@" manifests/v1alpha3/katib-controller/katib-config.yaml
-sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/suggestion-hyperopt@${REGISTRY}\/${REPO_NAME}\/v1alpha3\/suggestion-hyperopt:${VERSION}@" manifests/v1alpha3/katib-controller/katib-config.yaml
-sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/suggestion-skopt@${REGISTRY}\/${REPO_NAME}\/v1alpha3\/suggestion-skopt:${VERSION}@" manifests/v1alpha3/katib-controller/katib-config.yaml
+sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/suggestion-nasrl@${REGISTRY}\/${REPO_NAME}\/v1alpha3\/suggestion-nasrl@" manifests/v1alpha3/katib-controller/katib-config.yaml
+sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/suggestion-hyperband@${REGISTRY}\/${REPO_NAME}\/v1alpha3\/suggestion-hyperband@" manifests/v1alpha3/katib-controller/katib-config.yaml
+sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/suggestion-chocolate@${REGISTRY}\/${REPO_NAME}\/v1alpha3\/suggestion-chocolate@" manifests/v1alpha3/katib-controller/katib-config.yaml
+sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/suggestion-hyperopt@${REGISTRY}\/${REPO_NAME}\/v1alpha3\/suggestion-hyperopt@" manifests/v1alpha3/katib-controller/katib-config.yaml
+sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1alpha3\/suggestion-skopt@${REGISTRY}\/${REPO_NAME}\/v1alpha3\/suggestion-skopt@" manifests/v1alpha3/katib-controller/katib-config.yaml
 
 cat manifests/v1alpha3/katib-controller/katib-config.yaml