Skip to content

[full-ci] replace nodejs-ci image #1780

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

Draft
ScharfViktor wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[full-ci] replace nodejs-ci image #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 13 additions & 16 deletions .woodpecker.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ MINIO_MC = "minio/mc:RELEASE.2021-10-07T04-19-58Z"
OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier"
OC_CI_DRONE_ANSIBLE = "owncloudci/drone-ansible:latest"
OC_CI_GOLANG = "quay.io/opencloudeu/golang-ci:1.25"
OC_CI_NODEJS = "owncloudci/nodejs:22"
OC_CI_NODEJS = "scharfvi/nodeci:24"
OC_CI_NODEJS_ALPINE = "scharfvi/nodeci-alpine:24"
OC_CI_WAIT_FOR = "owncloudci/wait-for:latest"
ONLYOFFICE_DOCUMENT_SERVER = "onlyoffice/documentserver:8.1.3"
PLUGINS_GH_PAGES = "plugins/gh-pages:1"
Expand Down Expand Up @@ -501,7 +502,7 @@ def unitTests(ctx):
[
{
"name": "unit-tests",
"image": OC_CI_NODEJS,
"image": OC_CI_NODEJS_ALPINE,
"commands": [
"pnpm test:unit --coverage",
],
Expand Down Expand Up @@ -591,7 +592,7 @@ def e2eTests(ctx):

steps = restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") + \
installPnpm() + \
restoreBrowsersCache() + \
restoreBrowsersCache(browser_name) + \
restoreBuildArtifactCache(ctx, "web-dist", "dist") + \
restoreOpenCloudCache()

Expand Down Expand Up @@ -619,14 +620,10 @@ def e2eTests(ctx):
steps += (tikaService() if params["tikaNeeded"] else []) + \
openCloudService(params["extraServerEnvironment"])

if browser_name == "firefox":
if browser_name == "firefox" or browser_name == "webkit":
environment["FAIL_ON_UNCAUGHT_CONSOLE_ERR"] = "False"

if browser_name == "webkit":
environment["FAIL_ON_UNCAUGHT_CONSOLE_ERR"] = "False"
command = "pnpm playwright install-deps webkit && cd tests/e2e && bash run-e2e.sh "
else:
command = "cd tests/e2e && bash run-e2e.sh "
command = "cd tests/e2e && bash run-e2e.sh "

if "suites" in matrix:
command += "--suites %s" % ",".join(params["suites"])
Expand All @@ -637,7 +634,7 @@ def e2eTests(ctx):
return []

if "mobile-view" in suite:
command = "pnpm playwright install-deps webkit && pnpm test:e2e:mobile-parallel"
command = "pnpm test:e2e:mobile-parallel"
pipeline_name = "e2e-tests-%s" % suite
else:
pipeline_name = "e2e-tests-%s-%s" % (suite, browser_name)
Expand Down Expand Up @@ -742,7 +739,7 @@ def installBrowsers():
"commands": [
". ./.woodpecker.env",
"if $BROWSER_CACHE_FOUND; then exit 0; fi",
"pnpm exec playwright install --with-deps",
"pnpm exec playwright install",
"pnpm exec playwright install --list",
"tar -czvf %s .playwright" % dir["playwrightBrowsersArchive"],
],
Expand All @@ -751,7 +748,7 @@ def installBrowsers():
def lint():
return [{
"name": "lint",
"image": OC_CI_NODEJS,
"image": OC_CI_NODEJS_ALPINE,
"commands": [
"pnpm lint",
],
Expand All @@ -761,14 +758,14 @@ def formatCheck():
return [
{
"name": "format-check",
"image": OC_CI_NODEJS,
"image": OC_CI_NODEJS_ALPINE,
"commands": [
"pnpm format:check",
],
},
{
"name": "show-diff",
"image": OC_CI_NODEJS,
"image": OC_CI_NODEJS_ALPINE,
"commands": [
"pnpm format:write",
"git diff",
Expand Down Expand Up @@ -1563,7 +1560,7 @@ def keycloakService():
def e2eTestsOnKeycloak(ctx):
steps = restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") + \
installPnpm() + \
restoreBrowsersCache() + \
restoreBrowsersCache("chromium") + \
ldapService() + \
keycloakService() + \
restoreBuildArtifactCache(ctx, "web-dist", "dist") + \
Expand Down Expand Up @@ -1686,7 +1683,7 @@ def checkBrowsersCache():
],
}]

def restoreBrowsersCache():
def restoreBrowsersCache(browser):
return [
{
"name": "restore-browsers-cache",
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/run-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

SCRIPT_PATH=$(dirname "$0")
SCRIPT_PATH=$(cd "${SCRIPT_PATH_REL}" && pwd) # absolute path
SCRIPT_PATH=$(cd "${SCRIPT_PATH_REL}" && pwd)
FEATURES_DIR="${SCRIPT_PATH}/cucumber/features"
PROJECT_ROOT=$(cd "$SCRIPT_PATH/../../" && pwd)
SCRIPT_PATH_REL=${SCRIPT_PATH//"$PROJECT_ROOT/"/}
Expand Down