Skip to content

Commit

Permalink
Merge branch 'cs3org:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@mirekys
mirekys authored Jan 4, 2023
2 parents 42aff3b + 8717aa6 commit 90f404d
Show file tree
Hide file tree
Showing 105 changed files with 1,174 additions and 2,277 deletions.
2 changes: 1 addition & 1 deletion .drone.env
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# The test runner source for API tests
CORE_COMMITID=e214aaaf4e1bafcc4d58495f0c8c789d87431fe5
CORE_COMMITID=3d6c0aafd7710bee6a115c27742a7939b622079e
CORE_BRANCH=master
165 changes: 28 additions & 137 deletions .drone.star
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
def makeStep(target):
OC_CI_GOLANG = "owncloudci/golang:1.19"
OC_CI_ALPINE = "owncloudci/alpine:latest"
OSIXIA_OPEN_LDAP = "osixia/openldap:1.3.0"
OC_CI_PHP = "owncloudci/php:7.4"
OC_LITMUS = "owncloud/litmus:latest"
OC_CS3_API_VALIDATOR = "owncloud/cs3api-validator:0.2.0"
OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier:latest"

def makeStep():
return {
"name": "build",
"image": "registry.cern.ch/docker.io/library/golang:1.19",
"image": OC_CI_GOLANG,
"commands": [
"make %s" % target,
"make build",
],
}

def cloneOc10TestReposStep():
return {
"name": "clone-oC10-test-repos",
"image": "registry.cern.ch/docker.io/owncloudci/alpine:latest",
"image": OC_CI_ALPINE,
"commands": [
"source /drone/src/.drone.env",
"git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing",
Expand All @@ -24,7 +32,7 @@ def cloneOc10TestReposStep():
def ldapService():
return {
"name": "ldap",
"image": "registry.cern.ch/docker.io/osixia/openldap:1.3.0",
"image": OSIXIA_OPEN_LDAP,
"pull": "always",
"environment": {
"LDAP_DOMAIN": "owncloud.com",
Expand All @@ -35,16 +43,6 @@ def ldapService():
},
}

def redisService():
return {
"name": "redis",
"image": "registry.cern.ch/docker.io/webhippie/redis",
"pull": "always",
"environment": {
"REDIS_DATABASES": 1,
},
}

def cephService():
return {
"name": "ceph",
Expand All @@ -71,8 +69,6 @@ def main(ctx):
# implemented for: ocisIntegrationTests and s3ngIntegrationTests
return [
checkStarlark(),
litmusOcisOldWebdav(),
litmusOcisNewWebdav(),
litmusOcisSpacesDav(),
virtualViews(),
] + ocisIntegrationTests(6) + s3ngIntegrationTests(12)
Expand All @@ -95,10 +91,10 @@ def virtualViews():
},
},
"steps": [
makeStep("build-ci"),
makeStep(),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.19",
"image": OC_CI_GOLANG,
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
Expand All @@ -113,7 +109,7 @@ def virtualViews():
cloneOc10TestReposStep(),
{
"name": "oC10APIAcceptanceTestsOcisStorage",
"image": "registry.cern.ch/docker.io/owncloudci/php:7.4",
"image": OC_CI_PHP,
"commands": [
"cd /drone/src",
"composer self-update",
Expand All @@ -136,111 +132,6 @@ def virtualViews():
],
}

def litmusOcisOldWebdav():
return {
"kind": "pipeline",
"type": "docker",
"name": "litmus-ocis-old-webdav",
"platform": {
"os": "linux",
"arch": "amd64",
},
"trigger": {
"event": {
"include": [
"pull_request",
"tag",
],
},
},
"steps": [
makeStep("build-ci"),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.19",
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
"/drone/src/cmd/revad/revad -c frontend.toml &",
"/drone/src/cmd/revad/revad -c gateway.toml &",
"/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
"/drone/src/cmd/revad/revad -c users.toml",
],
},
{
"name": "sleep-for-revad-start",
"image": "registry.cern.ch/docker.io/library/golang:1.19",
"commands": [
"sleep 5",
],
},
{
"name": "litmus-ocis-old-webdav",
"image": "registry.cern.ch/docker.io/owncloud/litmus:latest",
"environment": {
"LITMUS_URL": "http://revad-services:20080/remote.php/webdav",
"LITMUS_USERNAME": "einstein",
"LITMUS_PASSWORD": "relativity",
"TESTS": "basic http copymove props",
},
},
],
}

def litmusOcisNewWebdav():
return {
"kind": "pipeline",
"type": "docker",
"name": "litmus-ocis-new-webdav",
"platform": {
"os": "linux",
"arch": "amd64",
},
"trigger": {
"event": {
"include": [
"pull_request",
"tag",
],
},
},
"steps": [
makeStep("build-ci"),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.19",
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
"/drone/src/cmd/revad/revad -c frontend.toml &",
"/drone/src/cmd/revad/revad -c gateway.toml &",
"/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
"/drone/src/cmd/revad/revad -c users.toml",
],
},
{
"name": "sleep-for-revad-start",
"image": "registry.cern.ch/docker.io/library/golang:1.19",
"commands": [
"sleep 5",
],
},
{
"name": "litmus-ocis-new-webdav",
"image": "registry.cern.ch/docker.io/owncloud/litmus:latest",
"environment": {
# UUID is einstein user, see https://github.com/owncloud/ocis-accounts/blob/8de0530f31ed5ffb0bbb7f7f3471f87f429cb2ea/pkg/service/v0/service.go#L45
"LITMUS_URL": "http://revad-services:20080/remote.php/dav/files/4c510ada-c86b-4815-8820-42cdf82c3d51",
"LITMUS_USERNAME": "einstein",
"LITMUS_PASSWORD": "relativity",
"TESTS": "basic http copymove props",
},
},
],
}

def litmusOcisSpacesDav():
return {
"kind": "pipeline",
Expand All @@ -259,10 +150,10 @@ def litmusOcisSpacesDav():
},
},
"steps": [
makeStep("build-ci"),
makeStep(),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.19",
"image": OC_CI_GOLANG,
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
Expand All @@ -276,14 +167,14 @@ def litmusOcisSpacesDav():
},
{
"name": "sleep-for-revad-start",
"image": "registry.cern.ch/docker.io/library/golang:1.19",
"image": OC_CI_GOLANG,
"commands": [
"sleep 5",
],
},
{
"name": "litmus-owncloud-spaces-dav",
"image": "registry.cern.ch/docker.io/owncloud/litmus:latest",
"image": OC_LITMUS,
"environment": {
"LITMUS_USERNAME": "einstein",
"LITMUS_PASSWORD": "relativity",
Expand Down Expand Up @@ -324,10 +215,10 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
},
},
"steps": [
makeStep("build-ci"),
makeStep(),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.19",
"image": OC_CI_GOLANG,
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
Expand All @@ -343,7 +234,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
cloneOc10TestReposStep(),
{
"name": "oC10APIAcceptanceTestsOcisStorage",
"image": "registry.cern.ch/docker.io/owncloudci/php:7.4",
"image": OC_CI_PHP,
"commands": [
"cd /drone/src/tmp/testrunner",
"composer self-update",
Expand Down Expand Up @@ -400,10 +291,10 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
},
},
"steps": [
makeStep("build-ci"),
makeStep(),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.19",
"image": OC_CI_GOLANG,
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
Expand All @@ -419,7 +310,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
cloneOc10TestReposStep(),
{
"name": "oC10APIAcceptanceTestsS3ngStorage",
"image": "registry.cern.ch/docker.io/owncloudci/php:7.4",
"image": OC_CI_PHP,
"commands": [
"cd /drone/src/tmp/testrunner",
"composer self-update",
Expand Down Expand Up @@ -460,14 +351,14 @@ def checkStarlark():
"steps": [
{
"name": "format-check-starlark",
"image": "registry.cern.ch/docker.io/owncloudci/bazel-buildifier:latest",
"image": OC_CI_BAZEL_BUILDIFIER,
"commands": [
"buildifier --mode=check .drone.star",
],
},
{
"name": "show-diff",
"image": "registry.cern.ch/docker.io/owncloudci/bazel-buildifier:latest",
"image": OC_CI_BAZEL_BUILDIFIER,
"commands": [
"buildifier --mode=fix .drone.star",
"git diff",
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/docker.yml
View file

This file was deleted.

28 changes: 27 additions & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,33 @@ jobs:
run: make dist VERSION=${{ github.ref_name }} GIT_COMMIT=${{ github.sha }} GO_VERSION=$(go version | awk '{print $3}')
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: "dist/*"
body_path: "changelog/NOTE.md"
docker:
runs-on: self-hosted
strategy:
matrix:
include:
- tag: ${{ secrets.DOCKERHUB_ORGANIZATION }}/reva:${{ github.ref_name }}
file: Dockerfile.reva
- tag: ${{ secrets.DOCKERHUB_ORGANIZATION }}/revad:${{ github.ref_name }}
file: Dockerfile.revad
- tag: ${{ secrets.DOCKERHUB_ORGANIZATION }}/revad:${{ github.ref_name }}-eos
file: Dockerfile.revad-eos
- tag: ${{ secrets.DOCKERHUB_ORGANIZATION }}/revad:${{ github.ref_name }}-ceph
file: Dockerfile.revad-ceph
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push ${{ matrix.tag }}
uses: docker/build-push-action@v3
with:
push: true
file: docker/${{ matrix.file }}
tags: ${{ matrix.tag }}
Loading

0 comments on commit 90f404d

Please sign in to comment.