Compare commits

...

7 Commits

Author SHA1 Message Date
Rahul Padigela 15637e8f49 try arsenal changes 2021-07-06 16:42:15 -07:00
Thomas Carmet 296b40e8be Lower ceph cpu to fit 2021-06-30 14:42:33 -07:00
Thomas Carmet a5003d80b5 add support for ceph tests 2021-06-30 13:54:15 -07:00
Thomas Carmet 4b403a4f58 Add tooling and debugging for devs 2021-06-30 13:47:41 -07:00
Thomas Carmet ace2179c56 testing new secret 2021-06-30 10:51:40 -07:00
Thomas Carmet 9c4ed65efa Remove azure test vars 2021-06-30 09:53:21 -07:00
Thomas Carmet 17a96e10ea Setting up azure mock for testing 2021-06-29 17:47:26 -07:00
7 changed files with 65 additions and 41 deletions

View File

@ -0,0 +1,12 @@
# Running Azurite
(Azurite)[https://github.com/azure/azurite] is the blob server mock developed by Azure itself.
## Running with docker
The following command will run Azurite locally on your machine with the proper credentials
to run Cloudserver's test.
```shell
docker run --rm --env AZURITE_ACCOUNTS="fakeaccountname:Fake00Key001;fakeaccountname2:Fake00Key002" -p 10000:10000 mcr.microsoft.com/azure-storage/azurite
```

View File

@ -7,31 +7,6 @@ branches:
models: models:
- env: &global-env - env: &global-env
azurebackend_AZURE_STORAGE_ACCESS_KEY: >-
%(secret:azure_storage_access_key)s
azurebackend_AZURE_STORAGE_ACCOUNT_NAME: >-
%(secret:azure_storage_account_name)s
azurebackend_AZURE_STORAGE_ENDPOINT: >-
%(secret:azure_storage_endpoint)s
azurebackend2_AZURE_STORAGE_ACCESS_KEY: >-
%(secret:azure_storage_access_key_2)s
azurebackend2_AZURE_STORAGE_ACCOUNT_NAME: >-
%(secret:azure_storage_account_name_2)s
azurebackend2_AZURE_STORAGE_ENDPOINT: >-
%(secret:azure_storage_endpoint_2)s
azurebackendmismatch_AZURE_STORAGE_ACCESS_KEY: >-
%(secret:azure_storage_access_key)s
azurebackendmismatch_AZURE_STORAGE_ACCOUNT_NAME: >-
%(secret:azure_storage_account_name)s
azurebackendmismatch_AZURE_STORAGE_ENDPOINT: >-
%(secret:azure_storage_endpoint)s
azurenonexistcontainer_AZURE_STORAGE_ACCESS_KEY: >-
%(secret:azure_storage_access_key)s
azurenonexistcontainer_AZURE_STORAGE_ACCOUNT_NAME: >-
%(secret:azure_storage_account_name)s
azurenonexistcontainer_AZURE_STORAGE_ENDPOINT: >-
%(secret:azure_storage_endpoint)s
azuretest_AZURE_BLOB_ENDPOINT: "%(secret:azure_storage_endpoint)s"
b2backend_B2_ACCOUNT_ID: "%(secret:b2backend_b2_account_id)s" b2backend_B2_ACCOUNT_ID: "%(secret:b2backend_b2_account_id)s"
b2backend_B2_STORAGE_ACCESS_KEY: >- b2backend_B2_STORAGE_ACCESS_KEY: >-
%(secret:b2backend_b2_storage_access_key)s %(secret:b2backend_b2_storage_access_key)s

View File

@ -196,10 +196,10 @@ spec:
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
requests: requests:
cpu: 500m cpu: 400m
memory: 1536Mi memory: 1536Mi
limits: limits:
cpu: 500m cpu: 400m
memory: 1536Mi memory: 1536Mi
volumeMounts: volumeMounts:
- name: artifacts - name: artifacts
@ -222,6 +222,27 @@ spec:
cpu: 100m cpu: 100m
memory: 128Mi memory: 128Mi
{%- endif %} {%- endif %}
{% if vars.env.S3DATA is defined and vars.env.S3DATA == "multiple" -%}
- name: azurite
image: mcr.microsoft.com/azure-storage/azurite:3.13.0
command: ['azurite']
args: ['--blobHost', '0.0.0.0', '--debug', '/artifacts/azurite.log']
env:
- name: AZURITE_ACCOUNTS
value: "fakeaccountname:Fake00Key001;fakeaccountname2:Fake00Key002"
volumeMounts:
- name: azurite
mountPath: /data
- name: artifacts
mountPath: /artifacts
resources:
requests:
cpu: 100m
memory: 256Mi
limits:
cpu: 100m
memory: 256Mi
{% endif %}
volumes: volumes:
- name: creds - name: creds
emptyDir: {} emptyDir: {}
@ -231,3 +252,5 @@ spec:
emptyDir: {} emptyDir: {}
- name: kmip-certs - name: kmip-certs
emptyDir: {} emptyDir: {}
- name: azurite
emptyDir: {}

View File

@ -20,7 +20,7 @@
"homepage": "https://github.com/scality/S3#readme", "homepage": "https://github.com/scality/S3#readme",
"dependencies": { "dependencies": {
"@hapi/joi": "^17.1.0", "@hapi/joi": "^17.1.0",
"arsenal": "github:scality/Arsenal#e1a3b05", "arsenal": "github:scality/Arsenal#w/8.1/bugfix/ARSN-1/remove-contentmd5-check-azure",
"async": "~2.5.0", "async": "~2.5.0",
"aws-sdk": "2.905.0", "aws-sdk": "2.905.0",
"azure-storage": "^2.1.0", "azure-storage": "^2.1.0",

View File

@ -137,7 +137,7 @@
"objectId": "azurebackend", "objectId": "azurebackend",
"legacyAwsBehavior": true, "legacyAwsBehavior": true,
"details": { "details": {
"azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/", "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
"azureStorageAccountName": "fakeaccountname", "azureStorageAccountName": "fakeaccountname",
"azureStorageAccessKey": "Fake00Key001", "azureStorageAccessKey": "Fake00Key001",
"bucketMatch": true, "bucketMatch": true,
@ -149,7 +149,7 @@
"objectId": "azurebackend2", "objectId": "azurebackend2",
"legacyAwsBehavior": true, "legacyAwsBehavior": true,
"details": { "details": {
"azureStorageEndpoint": "https://fakeaccountname2.blob.core.fake.net/", "azureStorageEndpoint": "http://localhost:10000/fakeaccountname2",
"azureStorageAccountName": "fakeaccountname2", "azureStorageAccountName": "fakeaccountname2",
"azureStorageAccessKey": "Fake00Key002", "azureStorageAccessKey": "Fake00Key002",
"bucketMatch": true, "bucketMatch": true,
@ -161,7 +161,7 @@
"objectId": "azurebackendmismatch", "objectId": "azurebackendmismatch",
"legacyAwsBehavior": true, "legacyAwsBehavior": true,
"details": { "details": {
"azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/", "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
"azureStorageAccountName": "fakeaccountname", "azureStorageAccountName": "fakeaccountname",
"azureStorageAccessKey": "Fake00Key001", "azureStorageAccessKey": "Fake00Key001",
"bucketMatch": false, "bucketMatch": false,
@ -173,9 +173,9 @@
"objectId": "azurenonexistcontainer", "objectId": "azurenonexistcontainer",
"legacyAwsBehavior": true, "legacyAwsBehavior": true,
"details": { "details": {
"azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/", "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
"azureStorageAccountName": "fakeaccountname", "azureStorageAccountName": "fakeaccountname",
"azureStorageAccessKey": "Fake00Key123", "azureStorageAccessKey": "Fake00Key001",
"bucketMatch": true, "bucketMatch": true,
"azureContainerName": "s3createbucketonfly" "azureContainerName": "s3createbucketonfly"
} }

View File

@ -109,7 +109,7 @@
"objectId": "azurebackend", "objectId": "azurebackend",
"legacyAwsBehavior": true, "legacyAwsBehavior": true,
"details": { "details": {
"azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/", "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
"azureStorageAccountName": "fakeaccountname", "azureStorageAccountName": "fakeaccountname",
"azureStorageAccessKey": "Fake00Key001", "azureStorageAccessKey": "Fake00Key001",
"bucketMatch": true, "bucketMatch": true,
@ -121,7 +121,7 @@
"objectId": "azurebackend2", "objectId": "azurebackend2",
"legacyAwsBehavior": true, "legacyAwsBehavior": true,
"details": { "details": {
"azureStorageEndpoint": "https://fakeaccountname2.blob.core.fake.net/", "azureStorageEndpoint": "http://localhost:10000/fakeaccountname2",
"azureStorageAccountName": "fakeaccountname2", "azureStorageAccountName": "fakeaccountname2",
"azureStorageAccessKey": "Fake00Key002", "azureStorageAccessKey": "Fake00Key002",
"bucketMatch": true, "bucketMatch": true,
@ -133,7 +133,7 @@
"objectId": "azurebackendmismatch", "objectId": "azurebackendmismatch",
"legacyAwsBehavior": true, "legacyAwsBehavior": true,
"details": { "details": {
"azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/", "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
"azureStorageAccountName": "fakeaccountname", "azureStorageAccountName": "fakeaccountname",
"azureStorageAccessKey": "Fake00Key001", "azureStorageAccessKey": "Fake00Key001",
"bucketMatch": false, "bucketMatch": false,
@ -145,9 +145,9 @@
"objectId": "azurenonexistcontainer", "objectId": "azurenonexistcontainer",
"legacyAwsBehavior": true, "legacyAwsBehavior": true,
"details": { "details": {
"azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/", "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
"azureStorageAccountName": "fakeaccountname", "azureStorageAccountName": "fakeaccountname",
"azureStorageAccessKey": "Fake00Key123", "azureStorageAccessKey": "Fake00Key001",
"bucketMatch": true, "bucketMatch": true,
"azureContainerName": "s3createbucketonfly" "azureContainerName": "s3createbucketonfly"
} }

View File

@ -689,9 +689,9 @@ arraybuffer.slice@~0.0.7:
resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
"arsenal@github:scality/Arsenal#e1a3b05": "arsenal@github:scality/Arsenal#w/8.1/bugfix/ARSN-1/remove-contentmd5-check-azure":
version "8.2.1" version "8.2.2"
resolved "https://codeload.github.com/scality/Arsenal/tar.gz/e1a3b05330598a656806e888a760b65711fbfd76" resolved "https://codeload.github.com/scality/Arsenal/tar.gz/0f63de2f05a0dd7f73e9a5356d930211893beb58"
dependencies: dependencies:
"@hapi/joi" "^15.1.0" "@hapi/joi" "^15.1.0"
JSONStream "^1.0.0" JSONStream "^1.0.0"
@ -701,6 +701,8 @@ arraybuffer.slice@~0.0.7:
aws-sdk "2.80.0" aws-sdk "2.80.0"
azure-storage "~2.1.0" azure-storage "~2.1.0"
backo "^1.1.0" backo "^1.1.0"
base-x "3.0.8"
base62 "2.0.1"
bson "4.0.0" bson "4.0.0"
debug "~4.1.0" debug "~4.1.0"
diskusage "^1.1.1" diskusage "^1.1.1"
@ -1107,6 +1109,18 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
base-x@3.0.8:
version "3.0.8"
resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.8.tgz#1e1106c2537f0162e8b52474a557ebb09000018d"
integrity sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==
dependencies:
safe-buffer "^5.0.1"
base62@2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/base62/-/base62-2.0.1.tgz#729cfe179ed34c61e4a489490105b44ce4ea1197"
integrity sha512-4t4WQK7mdbcWzqEBiq6tfo2qDCeIZGXvjifJZyxHIVcjQkZJxpFtu/pa2Va69OouCkg6izZ08hKnPxroeDyzew==
base64-arraybuffer@0.1.4: base64-arraybuffer@0.1.4:
version "0.1.4" version "0.1.4"
resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"