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.

Sign up for GitHub

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

integration test config #5058

Merged
merged 9 commits into from
Mar 15, 2024
Merged

integration test config #5058

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bd8b133
integration test config
troychiu Mar 14, 2024
6f53bc3
modify config
troychiu Mar 14, 2024
227e0d6
fix typo
troychiu Mar 14, 2024
aa914dc
fix integration.yml
troychiu Mar 14, 2024
857891c
debug
troychiu Mar 14, 2024
d2f68ba
fix config
troychiu Mar 14, 2024
3f9c131
fix suggestion
troychiu Mar 15, 2024
1608f89
fix suggestions
troychiu Mar 15, 2024
8dc337c
rename
troychiu Mar 15, 2024
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
2 changes: 2 additions & 0 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ jobs:
with:
go-version: ${{ inputs.go-version }}
- name: Integration
env:
ADMIN_DB_CONFIG: CI
run: |
# attempt to clean up some unneeded data: https://github.com/actions/virtual-environments/issues/2840#issuecomment-790492173
sudo rm -rf /usr/share/dotnet
Expand Down
27 changes: 20 additions & 7 deletions flyteadmin/tests/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package tests
import (
"context"
"fmt"
"os"

"gorm.io/gorm"

Expand All @@ -19,8 +20,18 @@ const insertExecutionQueryStr = `INSERT INTO "executions" ` +
`("execution_project","execution_domain","execution_name","phase","launch_plan_id","workflow_id") ` +
`VALUES ('%s', '%s', '%s', '%s', '%d', '%d')`

const ENV_DB_CONFIG = "ADMIN_DB_CONFIG"

var adminScope = promutils.NewScope("flyteadmin")

func getDbConfigWithEnv() *database.DbConfig {
if os.Getenv(ENV_DB_CONFIG) == "CI" {
troychiu marked this conversation as resolved.
Show resolved Hide resolved
return getDbConfig()
troychiu marked this conversation as resolved.
Show resolved Hide resolved
troychiu marked this conversation as resolved.
Show resolved Hide resolved
} else {
return getSandboxDbConfig()
}
}

func getDbConfig() *database.DbConfig {
return &database.DbConfig{
Postgres: database.PostgresConfig{
Expand All @@ -32,13 +43,15 @@ func getDbConfig() *database.DbConfig {
}
}

func getLocalDbConfig() *database.DbConfig {
// Run `flytectl demo start` to start the sandbox
func getSandboxDbConfig() *database.DbConfig {
Comment on lines +46 to +47
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @ysysys3074 you can try this config to run integration tests

return &database.DbConfig{
Postgres: database.PostgresConfig{
Host: "localhost",
Port: 5432,
DbName: "flyteadmin",
User: "postgres",
Host: "localhost",
Port: 30001,
DbName: "flyte",
Password: "postgres",
User: "postgres",
},
}
}
Expand Down Expand Up @@ -74,7 +87,7 @@ func truncateAllTablesForTestingOnly() {
TruncateAdminTags := fmt.Sprintf("TRUNCATE TABLE admin_tags;")
TruncateExecutionAdminTags := fmt.Sprintf("TRUNCATE TABLE execution_admin_tags;")
ctx := context.Background()
db, err := repositories.GetDB(ctx, getDbConfig(), getLoggerConfig())
db, err := repositories.GetDB(ctx, getDbConfigWithEnv(), getLoggerConfig())
if err != nil {
logger.Fatalf(ctx, "Failed to open DB connection due to %v", err)
}
Expand Down Expand Up @@ -107,7 +120,7 @@ func truncateAllTablesForTestingOnly() {

func populateWorkflowExecutionForTestingOnly(project, domain, name string) {
InsertExecution := fmt.Sprintf(insertExecutionQueryStr, project, domain, name, "UNDEFINED", 1, 2)
db, err := repositories.GetDB(context.Background(), getDbConfig(), getLoggerConfig())
db, err := repositories.GetDB(context.Background(), getDbConfigWithEnv(), getLoggerConfig())
ctx := context.Background()
if err != nil {
logger.Fatalf(ctx, "Failed to open DB connection due to %v", err)
Expand Down
Loading