From aa65b93342f3f02af821e8c4c9d08d2fa08bbb72 Mon Sep 17 00:00:00 2001
From: "alessandro.pinna" <alessandro.pinna@sorint.it>
Date: Tue, 8 Feb 2022 14:08:22 +0100
Subject: [PATCH] ci: update gitea to v1.15.11

---
 .agola/config.jsonnet      | 2 +-
 internal/testutil/utils.go | 5 -----
 tests/setup_test.go        | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.agola/config.jsonnet b/.agola/config.jsonnet
index 82ab7c6..04a2258 100644
--- a/.agola/config.jsonnet
+++ b/.agola/config.jsonnet
@@ -37,7 +37,7 @@ local task_build_go(version, arch) = {
     { type: 'run', name: 'build docker/k8s drivers tests binary', command: 'CGO_ENABLED=0 go test -c ./internal/services/executor/driver -o ./bin/docker-tests' },
     { type: 'run', name: 'build integration tests binary', command: 'go test -tags "sqlite_unlock_notify" -c ./tests -o ./bin/integration-tests' },
     { type: 'run', name: 'run tests', command: 'SKIP_DOCKER_TESTS=1 SKIP_K8S_TESTS=1 go test -v -count 1 $(go list ./... | grep -v /tests)' },
-    { type: 'run', name: 'fetch gitea binary for integration tests', command: 'curl -L https://github.com/go-gitea/gitea/releases/download/v1.8.3/gitea-1.8.3-linux-amd64 -o ./bin/gitea && chmod +x ./bin/gitea' },
+    { type: 'run', name: 'fetch gitea binary for integration tests', command: 'curl -L https://github.com/go-gitea/gitea/releases/download/v1.15.11/gitea-1.15.11-linux-amd64 -o ./bin/gitea && chmod +x ./bin/gitea' },
     { type: 'save_to_workspace', contents: [{ source_dir: './bin', dest_dir: '/bin/', paths: ['*'] }] },
   ],
 };
diff --git a/internal/testutil/utils.go b/internal/testutil/utils.go
index 0faeb39..6779135 100644
--- a/internal/testutil/utils.go
+++ b/internal/testutil/utils.go
@@ -377,11 +377,6 @@ OFFLINE_MODE     = false
 [database]
 PATH     = {{ .Data }}/gitea/gitea.db
 DB_TYPE  = sqlite3
-HOST     =
-NAME     =
-USER     =
-PASSWD   =
-SSL_MODE = disable
 
 [indexer]
 ISSUE_INDEXER_PATH = {{ .Data }}/gitea/indexers/issues.bleve
diff --git a/tests/setup_test.go b/tests/setup_test.go
index 9271212..c388df8 100644
--- a/tests/setup_test.go
+++ b/tests/setup_test.go
@@ -104,7 +104,7 @@ func setupGitea(t *testing.T, dir, dockerBridgeAddress string) *testutil.TestGit
 
 	// wait for gitea ready
 	err = testutil.Wait(30*time.Second, func() (bool, error) {
-		cmd := exec.Command(tgitea.GiteaPath, "admin", "create-user", "--name", giteaUser01, "--email", giteaUser01+"@example.com", "--password", "password", "--admin", "--config", tgitea.ConfigPath)
+		cmd := exec.Command(tgitea.GiteaPath, "admin", "user", "create", "--name", giteaUser01, "--email", giteaUser01+"@example.com", "--password", "password", "--admin", "--config", tgitea.ConfigPath)
 		// just retry until no error
 		if err := cmd.Run(); err != nil {
 			return false, nil