diff --git a/flyteadmin/.travis.yml b/flyteadmin/.travis.yml index 4fcb90405..690d4b160 100644 --- a/flyteadmin/.travis.yml +++ b/flyteadmin/.travis.yml @@ -7,17 +7,16 @@ services: jobs: include: # dont push to dockerhub on forks - # TODO: restore integration tests on Travis once the story around pushing flyteadmin images to dockerhub is resolved - if: fork = true stage: test name: build test install: true - script: BUILD_PHASE=builder make docker_build + script: BUILD_PHASE=builder make docker_build && make k8s_integration - if: fork = false stage: test - name: build + name: build, integration test, and push install: true - script: BUILD_PHASE=builder make docker_build + script: BUILD_PHASE=builder make docker_build && make k8s_integration - stage: test name: unit tests install: make install diff --git a/flyteadmin/Makefile b/flyteadmin/Makefile index 625956007..e9b48f226 100644 --- a/flyteadmin/Makefile +++ b/flyteadmin/Makefile @@ -9,7 +9,7 @@ update_boilerplate: .PHONY: integration integration: - GOFLAGS="-count=1" go test -v -tags=integration ./tests/... + CGO_ENABLED=0 GOFLAGS="-count=1" go test -v -tags=integration ./tests/... .PHONY: k8s_integration k8s_integration: diff --git a/flyteadmin/script/integration/k8s/integration.yaml b/flyteadmin/script/integration/k8s/integration.yaml index 022f84c00..079925f27 100644 --- a/flyteadmin/script/integration/k8s/integration.yaml +++ b/flyteadmin/script/integration/k8s/integration.yaml @@ -243,13 +243,16 @@ metadata: data: # this will need to be templatized development.integration: |- - application: + server: httpPort: 8088 grpcPort: 8089 kube-config: "$HOME/.kube/config" + grpcServerReflection: true + security: + secure: false + useAuth: false flyteadmin: - httpPort: 8088 - grpcPort: 8089 + runScheduler: false roleNameKey: "iam.amazonaws.com/role" metricsScope: "flyte:" testing: @@ -294,6 +297,9 @@ data: scheme: local signedUrls: durationMinutes: 3 + Logger: + show-source: true + level: 5 storage: type: minio connection: @@ -307,7 +313,6 @@ data: max_size_mbs: 10 target_gc_percent: 100 container: "flyte" - prefix: metadata/admin task_resources: defaults: cpu: 100m @@ -397,7 +402,7 @@ spec: image: flyteadmin:test imagePullPolicy: IfNotPresent command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/flyteadmin_config.yaml", - "--application.kube-config", "/etc/flyte/config/flyteadmin_config.yaml", "migrate", "run"] + "--server.kube-config", "/etc/flyte/config/flyteadmin_config.yaml", "migrate", "run"] volumeMounts: - name: config-volume mountPath: /etc/flyte/config @@ -405,7 +410,7 @@ spec: image: flyteadmin:test imagePullPolicy: IfNotPresent command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/flyteadmin_config.yaml", - "--application.kube-config", "/etc/flyte/config/flyteadmin_config.yaml", "migrate", "seed-projects", + "--server.kube-config", "/etc/flyte/config/flyteadmin_config.yaml", "migrate", "seed-projects", "project", "admintests", "flytekit"] volumeMounts: - name: config-volume @@ -421,7 +426,7 @@ spec: path: /healthcheck port: 8088 command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/flyteadmin_config.yaml", - "--application.kube-config", "/etc/flyte/config/flyteadmin_config.yaml", "serve"] + "--server.kube-config", "/etc/flyte/config/flyteadmin_config.yaml", "serve"] ports: - containerPort: 8088 volumeMounts: diff --git a/flyteadmin/tests/task_execution_test.go b/flyteadmin/tests/task_execution_test.go index 61da4f3af..b81e1c264 100644 --- a/flyteadmin/tests/task_execution_test.go +++ b/flyteadmin/tests/task_execution_test.go @@ -375,8 +375,8 @@ func TestGetTaskExecutionData(t *testing.T) { assert.Nil(t, err) assert.NotNil(t, resp) - assert.Equal(t, taskExecInputURI, resp.Inputs.Url) + assert.NotEmpty(t, resp.Inputs.Url) assert.Equal(t, int64(25), resp.Inputs.Bytes) - assert.Equal(t, "s3://flyte/metadata/admin/output/uri", resp.Outputs.Url) + assert.NotEmpty(t, resp.Outputs.Url) assert.Equal(t, int64(26), resp.Outputs.Bytes) }