Skip to content

Commit 5f40284

Browse files
committed
fix: avoid hardcoded repo name
1 parent 06c401d commit 5f40284

1 file changed

Lines changed: 19 additions & 22 deletions

File tree

.woodpecker.star

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# Repository
55

6-
repo_slug = "opencloud-eu/opencloud"
6+
repo_slug = "opencloud-eu/opencloud-internal"
77
docker_repo_slug = "opencloudeu/opencloud"
88

99
# images
@@ -43,19 +43,19 @@ DEFAULT_NODEJS_VERSION = "20"
4343
CACHE_S3_SERVER = "https://s3.ci.opencloud.eu"
4444

4545
dirs = {
46-
"base": "/woodpecker/src/github.com/opencloud-eu/opencloud",
47-
"web": "/woodpecker/src/github.com/opencloud-eu/opencloud/webTestRunner",
48-
"zip": "/woodpecker/src/github.com/opencloud-eu/opencloud/zip",
49-
"webZip": "/woodpecker/src/github.com/opencloud-eu/opencloud/zip/web.tar.gz",
50-
"webPnpmZip": "/woodpecker/src/github.com/opencloud-eu/opencloud/zip/web-pnpm.tar.gz",
51-
"playwrightBrowsersArchive": "/woodpecker/src/github.com/opencloud-eu/opencloud/zip/playwright-browsers.tar.gz",
52-
"baseGo": "/go/src/github.com/opencloud-eu/opencloud",
46+
"base": "/woodpecker/src/github.com/%s" % repo_slug,
47+
"web": "/woodpecker/src/github.com/%s/webTestRunner" % repo_slug,
48+
"zip": "/woodpecker/src/github.com/%s/zip" % repo_slug,
49+
"webZip": "/woodpecker/src/github.com/%s/zip/web.tar.gz" % repo_slug,
50+
"webPnpmZip": "/woodpecker/src/github.com/%s/zip/web-pnpm.tar.gz" % repo_slug,
51+
"playwrightBrowsersArchive": "/woodpecker/src/github.com/%s/zip/playwright-browsers.tar.gz" % repo_slug,
52+
"baseGo": "/go/src/github.com/%s" % repo_slug,
5353
"gobinTar": "go-bin.tar.gz",
54-
"gobinTarPath": "/go/src/github.com/opencloud-eu/opencloud/go-bin.tar.gz",
54+
"gobinTarPath": "/go/src/github.com/%s/go-bin.tar.gz" % repo_slug,
5555
"opencloudConfig": "tests/config/woodpecker/opencloud-config.json",
56-
"opencloudRevaDataRoot": "/woodpecker/src/github.com/opencloud-eu/opencloud/srv/app/tmp/ocis/owncloud/data",
57-
"multiServiceOcBaseDataPath": "/woodpecker/src/github.com/opencloud-eu/opencloud/multiServiceData",
58-
"ocWrapper": "/woodpecker/src/github.com/opencloud-eu/opencloud/tests/ocwrapper",
56+
"opencloudRevaDataRoot": "/woodpecker/src/github.com/%s/srv/app/tmp/ocis/owncloud/data" % repo_slug,
57+
"multiServiceOcBaseDataPath": "/woodpecker/src/github.com/%s/multiServiceData" % repo_slug,
58+
"ocWrapper": "/woodpecker/src/github.com/%s/tests/ocwrapper" % repo_slug,
5959
"bannedPasswordList": "tests/config/woodpecker/banned-password-list.txt",
6060
"ocmProviders": "tests/config/woodpecker/providers.json",
6161
"opencloudBinPath": "opencloud/bin",
@@ -414,7 +414,7 @@ GRAPH_AVAILABLE_ROLES = "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d
414414
workspace = \
415415
{
416416
"base": "/go",
417-
"path": "src/github.com/opencloud-eu/opencloud/",
417+
"path": "src/github.com/%s/" % repo_slug,
418418
}
419419

420420
# minio mc environment variables
@@ -556,7 +556,6 @@ def main(ctx):
556556
def cachePipeline(ctx, name, steps):
557557
return {
558558
"name": "build-%s-cache" % name,
559-
"skip_clone": True,
560559
"steps": steps,
561560
"when": [
562561
{
@@ -2500,7 +2499,7 @@ def genericBuildArtifactCache(ctx, name, action, path):
25002499
return genericCache(name, action, [path], cache_path)
25012500

25022501
if action == "purge":
2503-
return purgeCache("purge_opencloud_build_artifact_cache", "cache/opencloud-eu/opencloud", 1)
2502+
return purgeCache("purge_opencloud_build_artifact_cache", "cache/%s" % repo_slug, 1)
25042503
return []
25052504

25062505
def restoreBuildArtifactCache(ctx, name, path):
@@ -2706,15 +2705,13 @@ def setupForLitmus():
27062705
}]
27072706

27082707
def getWoodpeckerEnvAndCheckScript(ctx):
2709-
opencloud_git_base_url = "https://raw.githubusercontent.com/opencloud-eu/opencloud"
2710-
path_to_woodpecker_env = "%s/%s/.woodpecker.env" % (opencloud_git_base_url, ctx.build.commit)
2711-
path_to_check_script = "%s/%s/tests/config/woodpecker/check_web_cache.sh" % (opencloud_git_base_url, ctx.build.commit)
2708+
path_to_woodpecker_env = "%s/.woodpecker.env" % dirs["base"]
2709+
path_to_check_script = "%s/tests/config/woodpecker/check_web_cache.sh" % dirs["base"]
27122710
return {
27132711
"name": "get-woodpecker-env-and-check-script",
27142712
"image": OC_UBUNTU,
27152713
"commands": [
2716-
"curl -s -o .woodpecker.env %s" % path_to_woodpecker_env,
2717-
"curl -s -o check_web_cache.sh %s" % path_to_check_script,
2714+
"cp %s check_web_cache.sh" % path_to_check_script,
27182715
],
27192716
}
27202717

@@ -2948,7 +2945,7 @@ def restoreBrowsersCache():
29482945
"name": "unzip-browsers-cache",
29492946
"image": OC_UBUNTU,
29502947
"commands": [
2951-
"tar -xf /woodpecker/src/github.com/opencloud-eu/opencloud/webTestRunner/playwright-browsers.tar.gz -C .",
2948+
"tar -xf /woodpecker/src/github.com/%s/webTestRunner/playwright-browsers.tar.gz -C ." % repo_slug,
29522949
],
29532950
},
29542951
]
@@ -3136,7 +3133,7 @@ def k6LoadTests(ctx):
31363133
if "skip" in config["k6LoadTests"] and config["k6LoadTests"]["skip"]:
31373134
return []
31383135

3139-
opencloud_git_base_url = "https://raw.githubusercontent.com/opencloud-eu/opencloud"
3136+
opencloud_git_base_url = "https://raw.githubusercontent.com/%s" % repo_slug
31403137
script_link = "%s/%s/tests/config/woodpecker/run_k6_tests.sh" % (opencloud_git_base_url, ctx.build.commit)
31413138

31423139
event_array = ["cron"]

0 commit comments

Comments
 (0)