Skip to content

Commit 7de70c4

Browse files
author
lamai93
committed
Added TESTOPTIONS and set sync to debug level.
1 parent efaf298 commit 7de70c4

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,10 @@ endif
484484
ifndef ARANGODIMAGE
485485
@echo ARANGODIMAGE must point to the usable arangodb enterprise image
486486
@exit 1
487+
endif
488+
ifndef ENTERPRISELICENSE
489+
@echo For tests using ArangoSync you most likely need the license key. Please set ENTERPRISELICENSE.
490+
@exit 1
487491
endif
488492
@echo Using ArangoSync source at $(ARANGOSYNCSRCDIR)
489493
@echo Using ArangoDB image $(ARANGODIMAGE)
@@ -503,4 +507,4 @@ ifdef PUSHIMAGES
503507
docker push $(ARANGOSYNCTESTIMAGE)
504508
docker push $(ARANGOSYNCIMAGE)
505509
endif
506-
$(ROOTDIR)/scripts/kube_run_sync_tests.sh $(DEPLOYMENTNAMESPACE) '$(ARANGODIMAGE)' '$(ARANGOSYNCIMAGE)' '$(ARANGOSYNCTESTIMAGE)' '$(ARANGOSYNCTESTCTRLIMAGE)'
510+
$(ROOTDIR)/scripts/kube_run_sync_tests.sh $(DEPLOYMENTNAMESPACE) '$(ARANGODIMAGE)' '$(ARANGOSYNCIMAGE)' '$(ARANGOSYNCTESTIMAGE)' '$(ARANGOSYNCTESTCTRLIMAGE)' '$(TESTOPTIONS)'

scripts/kube_run_sync_tests.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ARANGODIMAGE=$2
77
ARANGOSYNCIMAGE=$3
88
ARANOSYNCTESTIMAGE=$4
99
ARANOSYNCTESTCTRLIMAGE=$5
10+
TESTARGS=$6
1011

1112
ARANGOSYNCIMAGEID=$(docker inspect ${ARANGOSYNCIMAGE} '--format={{index .RepoDigests 0}}')
1213
ARANOSYNCTESTIMAGEID=$(docker inspect ${ARANOSYNCTESTIMAGE} '--format={{index .RepoDigests 0}}')
@@ -20,4 +21,5 @@ kubectl --namespace ${DEPLOYMENTNAMESPACE} \
2021
--arango-sync-image=${ARANGOSYNCIMAGEID} \
2122
--arango-sync-test-image=${ARANOSYNCTESTIMAGEID} \
2223
--license-key-secret-name=arangodb-jenkins-license-key \
23-
--namespace=${DEPLOYMENTNAMESPACE}
24+
--namespace=${DEPLOYMENTNAMESPACE} \
25+
--test-args="${TESTARGS}"

tests/sync/main.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ var (
3434
arangoSyncImage string
3535
licenseKeySecretName string
3636
namespace string
37+
additionalTestArgs string
3738
)
3839

3940
const (
@@ -50,6 +51,7 @@ func init() {
5051
flag.StringVar(&arangoSyncImage, "arango-sync-image", "", "ArangoSync Image used for testing")
5152
flag.StringVar(&licenseKeySecretName, "license-key-secret-name", "arangodb-license-key", "Secret name of the license key used for the deployments")
5253
flag.StringVar(&namespace, "namespace", "default", "Testing namespace")
54+
flag.StringVar(&additionalTestArgs, "test-args", "", "Additional parameters passed to the test executable")
5355
}
5456

5557
func newDeployment(ns, name string) *dapi.ArangoDeployment {
@@ -86,6 +88,9 @@ func newSyncDeployment(ns, name string, accessPackage bool) *dapi.ArangoDeployme
8688
},
8789
}
8890

91+
d.Spec.SyncMasters.Args = append(d.Spec.SyncMasters.Args, "--log.level=debug")
92+
d.Spec.SyncWorkers.Args = append(d.Spec.SyncWorkers.Args, "--log.level=debug")
93+
8994
if accessPackage {
9095
d.Spec.Sync.ExternalAccess.AccessPackageSecretNames = []string{accessPackageSecretName}
9196
}
@@ -141,18 +146,15 @@ func waitForSyncDeploymentReady(ctx context.Context, ns, name string, kubecli ku
141146

142147
sc, err := mustNewArangoDBSyncClient(ctx, kubecli, deployment)
143148
if err != nil {
144-
log.Printf("failed to create sync client: %s", err.Error())
145149
return err
146150
}
147151

148152
info, err := sc.Master().Status(ctx)
149153
if err != nil {
150-
log.Printf("failed to fetch status: %s", err.Error())
151154
return err
152155
}
153156

154157
if info.Status != sync.SyncStatusRunning {
155-
log.Printf("SyncStatus not running: %s", info.Status)
156158
return fmt.Errorf("SyncStatus not running: %s", info.Status)
157159
}
158160

@@ -296,7 +298,7 @@ func createArangoSyncTestPod(ns, name string) *corev1.Pod {
296298
Name: "tests",
297299
Image: arangoSyncTestImage,
298300
ImagePullPolicy: corev1.PullAlways,
299-
Args: []string{"-test.v"},
301+
Args: []string{"-test.v", additionalTestArgs},
300302
Env: []corev1.EnvVar{
301303
corev1.EnvVar{
302304
Name: "MASTERAENDPOINTS",

0 commit comments

Comments
 (0)