Skip to content

Commit 223d574

Browse files
Merge pull request #36 from owncloud/repair-setup
fix cdperf script usage
2 parents b0f092a + 8565060 commit 223d574

62 files changed

Lines changed: 4004 additions & 3978 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.babelrc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"presets": [
3+
[
4+
"@babel/env",
5+
{
6+
"useBuiltIns": "entry",
7+
"corejs": "3"
8+
}
9+
],
10+
"@babel/typescript"
11+
],
12+
"plugins": ["lodash", "@babel/proposal-class-properties", "@babel/proposal-object-rest-spread"]
13+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

.eslintrc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"plugins": ["simple-import-sort", "import"],
3+
"parser": "@typescript-eslint/parser",
4+
"parserOptions": {
5+
"ecmaVersion": 2020,
6+
"sourceType": "module"
7+
},
8+
"extends": ["plugin:@typescript-eslint/recommended", "prettier/@typescript-eslint", "plugin:prettier/recommended"],
9+
"rules": {
10+
"simple-import-sort/imports": "error",
11+
"simple-import-sort/exports": "error",
12+
"import/first": "error",
13+
"import/newline-after-import": "error",
14+
"import/no-duplicates": "error"
15+
}
16+
}

.prettierrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"semi": true,
3+
"trailingComma": "all",
4+
"singleQuote": true,
5+
"printWidth": 120,
6+
"tabWidth": 4
7+
}

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Changes in unreleased
2+
3+
## Summary
4+
5+
* Enhancement - Add upload delete trash tests: [#35](https://github.com/owncloud/cdperf/pull/35)
6+
* Enhancement - Add upload delete restore tests: [#35](https://github.com/owncloud/cdperf/pull/35)
7+
8+
## Details
9+
10+
* Enhancement - Add upload delete trash tests: [#35](https://github.com/owncloud/cdperf/pull/35)
11+
12+
Add tests for upload, delete and trash resources.
13+
14+
https://github.com/owncloud/cdperf/pull/35
15+
16+
* Enhancement - Add upload delete restore tests: [#35](https://github.com/owncloud/cdperf/pull/35)
17+
18+
Add tests for upload, delete and restore resources.
19+
20+
https://github.com/owncloud/cdperf/pull/35

src/k6/Dockerfile renamed to Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ ENTRYPOINT ["entrypoint"]
3636

3737
COPY --from=k6 /go/k6 /usr/bin/k6
3838

39-
COPY --from=node /k6/dist /scripts
39+
COPY --from=node /k6/tests /scripts

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@ ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
33

44
.PHONY: build
55
build:
6-
docker build --tag owncloud/cdperf-k6 src/k6
7-
docker run --rm --volume $(ROOT_DIR)/tests/k6:/cp owncloud/cdperf-k6 cp -r . /cp
6+
docker build --tag owncloud/cdperf-k6 .
7+
docker run --rm --volume $(ROOT_DIR)/tests:/cp owncloud/cdperf-k6 cp -r . /cp
88
chmod +x ./scripts/cdperf
99

1010
.PHONY: local
1111
local: clean
12-
cd src/k6 && yarn && yarn build
13-
mkdir -p tests/k6
14-
cp -R src/k6/dist/. tests/k6/
12+
yarn && yarn build
1513

1614
.PHONY: clean
1715
clean:
1816
rm -rf ./tests
1917

2018
.PHONY: changelog
2119
changelog:
22-
go run github.com/restic/calens -i ./changelog -t ./changelog/CHANGELOG.tmpl >| ./CHANGELOG.md
20+
go run github.com/restic/calens -i ./changelog -t ./changelog/CHANGELOG.tmpl >| ./CHANGELOG.md

changelog/unreleased/initial-version.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)