Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use python to define the E2E test workflow for kfctl. #4148

Merged
merged 2 commits into from
Sep 27, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions bootstrap/pkg/kfapp/gcp/gcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -1376,6 +1376,10 @@ func insertSecret(client *clientset.Clientset, secretName string, namespace stri
if err == nil {
return nil
} else {
if k8serrors.IsAlreadyExists(err) {
log.Infof("Secret %v.%v already exists", namespace, secretName)
return nil
}
return &kfapis.KfError{
Code: int(kfapis.INTERNAL_ERROR),
Message: err.Error(),
Expand Down
3 changes: 3 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module github.com/kubeflow/kubeflow

go 1.12
58 changes: 19 additions & 39 deletions prow_config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file configures the workflows to trigger in our Prow jobs.
# see kubeflow/testing/py/run_e2e_workflow.py
python_paths:
- kubeflow/kubeflow/py
workflows:
# deploy app test runs tests on gke.
- app_dir: kubeflow/kubeflow/testing/workflows
Expand All @@ -26,8 +28,7 @@ workflows:
params:
installIstio: true
workflowName: deployapp-istio
- app_dir: kubeflow/kubeflow/testing/workflows
component: kfctl_go_test
- py_func: kubeflow.kubeflow.ci.kfctl_e2e_workflow.create_workflow
name: kfctl-go-iap-endpoint
job_types:
- postsubmit
Expand All @@ -38,15 +39,11 @@ workflows:
- dependencies/*
- kubeflow/*
- testing/*
params:
platform: gke
gkeApiVersion: v1
workflowName: kfctl-go
useBasicAuth: false
useIstio: true
testEndpoint: true
configPath: https://raw.githubusercontent.com/kubeflow/manifests/master/kfdef/kfctl_gcp_iap.yaml
- app_dir: kubeflow/kubeflow/testing/workflows
kwargs:
use_basic_auth: false
test_endpoint: true
config_path: https://raw.githubusercontent.com/kubeflow/manifests/master/kfdef/kfctl_gcp_iap.yaml
- py_func: kubeflow.kubeflow.ci.kfctl_e2e_workflow.create_workflow
component: kfctl_go_test
name: kfctl-go-iap-istio
job_types:
Expand All @@ -57,16 +54,11 @@ workflows:
- dependencies/*
- kubeflow/*
- testing/*
params:
platform: gke
gkeApiVersion: v1
workflowName: kfctl-go
useBasicAuth: false
useIstio: true
configPath: https://raw.githubusercontent.com/kubeflow/manifests/master/kfdef/kfctl_gcp_iap.yaml
kwargs:
use_basic_auth: false
config_path: https://raw.githubusercontent.com/kubeflow/manifests/master/kfdef/kfctl_gcp_iap.yaml
# Run basic auth test as part of every periodic and postsubmit run.
- app_dir: kubeflow/kubeflow/testing/workflows
component: kfctl_go_test
- py_func: kubeflow.kubeflow.ci.kfctl_e2e_workflow.create_workflow
name: kfctl-go-basic-auth
job_types:
- postsubmit
Expand All @@ -76,34 +68,22 @@ workflows:
- deployment/*
- kubeflow/*
- testing/*
params:
platform: gke
gkeApiVersion: v1
workflowName: kfctl-go
useBasicAuth: true
useIstio: true
configPath: https://raw.githubusercontent.com/kubeflow/manifests/master/kfdef/kfctl_gcp_basic_auth.yaml
kwargs:
use_basic_auth: true
config_path: https://raw.githubusercontent.com/kubeflow/manifests/master/kfdef/kfctl_gcp_basic_auth.yaml
# Only run kfctl presubmit test with basic auth if
# files related to basic auth are modified.
- app_dir: kubeflow/kubeflow/testing/workflows
component: kfctl_go_test
- py_func: kubeflow.kubeflow.ci.kfctl_e2e_workflow.create_workflow
name: kfctl-go-basic-auth
job_types:
- presubmit
include_dirs:
# If kfctl is modified make sure basic auth still works
- bootstrap/*
- kubeflow/kubeflow/common/basic-auth.libsonnet
- kubeflow/kubeflow/common/prototypes/basic-auth.jsonnet
- testing/kfctl/*
- testing/workflows/kfctl_go_test.jsonnet
params:
platform: gke
gkeApiVersion: v1
workflowName: kfctl-go
useBasicAuth: true
useIstio: true
configPath: https://raw.githubusercontent.com/kubeflow/manifests/master/kfdef/kfctl_gcp_basic_auth.yaml
kwargs:
use_basic_auth: true
config_path: https://raw.githubusercontent.com/kubeflow/manifests/master/kfdef/kfctl_gcp_basic_auth.yaml
# Run unittests
# TODO(jlewi): Need to add step to run go and python unittests
- app_dir: kubeflow/kubeflow/testing/workflows
Expand Down
Loading