Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
20 changes: 20 additions & 0 deletions charts/backoffice/templates/tests/configmap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: "stern-integration"
annotations:
"helm.sh/hook": post-install
"helm.sh/hook-delete-policy": before-hook-creation
data:
integration.yaml: |
brig:
host: brig
port: 8080

galley:
host: galley
port: 8080

stern:
host: backoffice
port: 8080
25 changes: 25 additions & 0 deletions charts/backoffice/templates/tests/stern-integration.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
apiVersion: v1
kind: Pod
metadata:
name: "{{ .Release.Name }}-stern-integration"
annotations:
"helm.sh/hook": test
labels:
app: stern-integration
release: {{ .Release.Name }}
spec:
volumes:
- name: "stern-integration"
configMap:
name: "stern-integration"
containers:
- name: integration
image: "{{ .Values.image.repository }}-integration:{{ .Values.image.tag }}"
volumeMounts:
- name: "stern-integration"
mountPath: "/etc/wire/integration"
resources:
requests:
memory: "128Mi"
cpu: "1"
restartPolicy: Never
1 change: 1 addition & 0 deletions hack/bin/cabal-run-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ run_all_integration_tests() {
run_integration_tests "$package"
fi
done
run_integration_tests "stern"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

above the path is hardcoded to ./services/$package, but stern is underneath "./tools"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, true, for some reason it works anyway, but I will try to fix this anyway.

}

if [ "$package" == "all" ]; then
Expand Down
2 changes: 1 addition & 1 deletion hack/bin/integration-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ UPLOAD_LOGS=${UPLOAD_LOGS:-0}
echo "Running integration tests on wire-server with parallelism=${HELM_PARALLELISM} ..."

CHART=wire-server
tests=(galley cargohold gundeck federator spar brig)
tests=(stern galley cargohold gundeck federator spar brig)

cleanup() {
if (( CLEANUP_LOCAL_FILES > 0 )); then
Expand Down
2 changes: 1 addition & 1 deletion nix/wire-server.nix
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ let
gundeck = [ "gundeck" "gundeck-integration" "gundeck-schema" ];
proxy = [ "proxy" ];
spar = [ "spar" "spar-integration" "spar-schema" "spar-migrate-data" ];
stern = [ "stern" ];
stern = [ "stern" "stern-integration"];
Comment thread
battermann marked this conversation as resolved.

billing-team-member-backfill = [ "billing-team-member-backfill" ];
inconsistencies = [ "inconsistencies" ];
Expand Down
166 changes: 165 additions & 1 deletion tools/stern/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,116 @@
# dependencies are added or removed.
{ mkDerivation
, aeson
, aeson-qq
, amazonka
, amazonka-sqs
, async
, base
, base64-bytestring
, bilge
, binary
, brig-types
, bytestring
, bytestring-conversion
, call-stack
, case-insensitive
, cassandra-util
, cassava
, cereal
, comonad
, containers
, cookie
, cryptonite
, currency-codes
, data-default
, data-timeout
, directory
, errors
, exceptions
, extended
, extra
, federator
, filepath
, galley
, galley-types
, gitignoreSource
, gundeck-types
, hex
, HsOpenSSL
, HsOpenSSL-x509-system
, hspec
, http-client
, http-client-openssl
, http-client-tls
, http-media
, http-types
, imports
, kan-extensions
, lens
, lens-aeson
, lib
, memory
, metrics-wai
, mtl
, network
, network-uri
, optparse-applicative
, pem
, process
, proto-lens
, protobuf
, QuickCheck
, quickcheck-instances
, random
, raw-strings-qq
, retry
, safe
, saml2-web-sso
, schema-profunctor
, servant
, servant-client
, servant-client-core
, servant-server
, servant-swagger
, servant-swagger-ui
, singletons
, singletons-th
, sop-core
, split
, ssl-util
, streaming-commons
, string-conversions
, swagger2
, tagged
, tasty
, tasty-cannon
, tasty-hunit
, temporary
, text
, time
, tinylog
, tls
, transformers
, types-common
, types-common-aws
, types-common-journal
, unix
, unliftio
, unordered-containers
, uri-bytestring
, uuid
, uuid-types
, vector
, wai
, wai-extra
, wai-predicates
, wai-routing
, wai-utilities
, warp
, warp-tls
, wire-api
, wire-api-federation
, wire-message-proto-lens
, yaml
}:
mkDerivation {
Expand Down Expand Up @@ -103,13 +168,112 @@ mkDerivation {
yaml
];
executableHaskellDepends = [
aeson
aeson-qq
amazonka
amazonka-sqs
async
base
base64-bytestring
bilge
binary
brig-types
bytestring
bytestring-conversion
call-stack
case-insensitive
cassandra-util
cassava
cereal
comonad
containers
cookie
cryptonite
currency-codes
data-default
data-timeout
directory
errors
exceptions
extended
extra
federator
filepath
galley
galley-types
gundeck-types
hex
HsOpenSSL
HsOpenSSL-x509-system
hspec
http-client
http-client-openssl
http-client-tls
http-media
http-types
imports
kan-extensions
lens
lens-aeson
memory
metrics-wai
mtl
network
network-uri
optparse-applicative
pem
process
proto-lens
protobuf
QuickCheck
quickcheck-instances
random
raw-strings-qq
retry
safe
saml2-web-sso
schema-profunctor
servant
servant-client
servant-client-core
servant-server
servant-swagger
singletons
singletons-th
sop-core
ssl-util
streaming-commons
string-conversions
tagged
tasty
tasty-cannon
tasty-hunit
temporary
text
time
tinylog
tls
transformers
types-common
types-common-aws
types-common-journal
unix
unliftio
unordered-containers
uri-bytestring
uuid
uuid-types
vector
wai
wai-extra
wai-utilities
warp
warp-tls
wire-api
wire-api-federation
wire-message-proto-lens
yaml
];
testHaskellDepends = [ base tasty tasty-hunit wire-api ];
license = lib.licenses.agpl3Only;
mainProgram = "stern";
}
Loading