Commit e817923

committed

ci: fix e2e tests

1 parent bd183fa commit e817923Copy full SHA for e817923

File tree

18 files changed

+77

-405

lines changed

.github/workflows
- e2e-tests.yaml
e2e
- e2e_suite_test.go
- tests
  - build
    - build.go
  - proxyprovider
    - framework.go
    - proxyprovider.go
    - testdata
      - docker-recreate
        .devcontainer.json2
        .devcontainer.json
      - docker
        .devcontainer.json
        custom-docker-provider.yaml
        test.txt
      - proxyprovider
        proxy-provider.yaml
  - ssh
    - ssh.go
  - up
    - docker.go
    - docker_compose.go
    - testdata/docker-compose-features
      - .devcontainer.json
    - up.go
pkg
- devcontainer
  - build.go
- driver/kubernetes
  - run.go

18 files changed

+77

-405

lines changed

`‎.github/workflows/e2e-tests.yaml‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ jobs:`
`37`	`37`	`- "machine"`
`38`	`38`	`- "machineprovider"`
`39`	`39`	`- "provider"`
`40`		`- - "proxyprovider"`
`41`	`40`	`- "ssh"`
`42`	`41`	`- "up"`
`43`	`42`	`- "up-docker"`

`‎e2e/e2e_suite_test.go‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ import (`
`20`	`20`	`_ "github.com/loft-sh/devpod/e2e/tests/machine"`
`21`	`21`	`_ "github.com/loft-sh/devpod/e2e/tests/machineprovider"`
`22`	`22`	`_ "github.com/loft-sh/devpod/e2e/tests/provider"`
`23`		`- _ "github.com/loft-sh/devpod/e2e/tests/proxyprovider"`
`24`	`23`	`_ "github.com/loft-sh/devpod/e2e/tests/ssh"`
`25`	`24`	`_ "github.com/loft-sh/devpod/e2e/tests/up"`
`26`	`25`	`)`

`‎e2e/tests/build/build.go‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ var _ = DevPodDescribe("devpod build test suite", func() {`
`108`	`108`	`info := &config.ImageBuildInfo{Dockerfile: file}`
`109`	`109`
`110`	`110`	`// make sure images are there`
`111`		`- prebuildHash, err := config.CalculatePrebuildHash(cfg, "linux/amd64", "amd64", filepath.Dir(cfg.Origin), dockerfilePath, modifiedDockerfileContents, info, log.Default)`
	`111`	`+ prebuildHash, err := config.CalculatePrebuildHash(cfg, "linux/"+runtime.GOARCH, runtime.GOARCH, filepath.Dir(cfg.Origin), dockerfilePath, modifiedDockerfileContents, info, log.Default)`
`112`	`112`	`framework.ExpectNoError(err)`
`113`	`113`	`_, err = dockerHelper.InspectImage(ctx, build.GetImageName(tempDir, prebuildHash), false)`
`114`	`114`	`framework.ExpectNoError(err)`

`‎e2e/tests/proxyprovider/framework.go‎`

Lines changed: 0 additions & 8 deletions

This file was deleted.

`‎e2e/tests/proxyprovider/proxyprovider.go‎`

Lines changed: 0 additions & 193 deletions

This file was deleted.

`‎e2e/tests/proxyprovider/testdata/docker-recreate/.devcontainer.json‎`

Lines changed: 0 additions & 4 deletions

This file was deleted.

`‎e2e/tests/proxyprovider/testdata/docker-recreate/.devcontainer.json2‎`

Lines changed: 0 additions & 8 deletions

This file was deleted.

`‎e2e/tests/proxyprovider/testdata/docker/.devcontainer.json‎`

Lines changed: 0 additions & 4 deletions

This file was deleted.

`‎e2e/tests/proxyprovider/testdata/docker/custom-docker-provider.yaml‎`

Lines changed: 0 additions & 44 deletions

This file was deleted.

`‎e2e/tests/proxyprovider/testdata/docker/test.txt‎`

Lines changed: 0 additions & 1 deletion

This file was deleted.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e817923

File tree

18 files changed

18 files changed

`‎.github/workflows/e2e-tests.yaml‎`

`‎e2e/e2e_suite_test.go‎`

`‎e2e/tests/build/build.go‎`

`‎e2e/tests/proxyprovider/framework.go‎`

`‎e2e/tests/proxyprovider/proxyprovider.go‎`

`‎e2e/tests/proxyprovider/testdata/docker-recreate/.devcontainer.json‎`

`‎e2e/tests/proxyprovider/testdata/docker-recreate/.devcontainer.json2‎`

`‎e2e/tests/proxyprovider/testdata/docker/.devcontainer.json‎`

`‎e2e/tests/proxyprovider/testdata/docker/custom-docker-provider.yaml‎`

`‎e2e/tests/proxyprovider/testdata/docker/test.txt‎`

0 commit comments