fix(manager): enable client encryption for Manager tests

Until now, all Manager basic tests were run with disabled client encryption. This change adds `client_encrypt: true` to all active Manager yaml configurations, thus, enabling Scylla client encryption in tests. Encryption is kept disabled for only two jobs (ubuntu24-manager-sanity, ubuntu24-manager-upgrade) to have at least one job running with such configuration. To disable encryption for these specific tests a separate configuration yaml was introduced `disable_client_encrypt.yaml`.
scylladb · Feb 3, 2025 · 883e1dc · 883e1dc
1 parent e510c29
commit 883e1dc
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 2 deletions.
diff --git a/configurations/disable_client_encrypt.yaml b/configurations/disable_client_encrypt.yaml
@@ -0,0 +1 @@
+client_encrypt: false
diff --git a/jenkins-pipelines/manager/ubuntu24-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/ubuntu24-manager-sanity.jenkinsfile
@@ -7,7 +7,7 @@ managerPipeline(
     backend: 'aws',
     region: 'us-east-1',
     test_name: 'mgmt_cli_test.ManagerSanityTests.test_manager_sanity',
-    test_config: '''["test-cases/manager/manager-regression-singleDC-set-distro.yaml", "configurations/manager/ubuntu24.yaml"]''',
+    test_config: '''["test-cases/manager/manager-regression-singleDC-set-distro.yaml", "configurations/manager/ubuntu24.yaml", "configurations/disable_client_encrypt.yaml"]''',
 
     post_behavior_db_nodes: 'destroy',
     post_behavior_loader_nodes: 'destroy',

diff --git a/jenkins-pipelines/manager/ubuntu24-manager-upgrade.jenkinsfile b/jenkins-pipelines/manager/ubuntu24-manager-upgrade.jenkinsfile
@@ -13,7 +13,7 @@ managerPipeline(
     manager_version: '3.4.0',
 
     test_name: 'mgmt_upgrade_test.ManagerUpgradeTest.test_upgrade',
-    test_config: '''["test-cases/upgrades/manager-upgrade.yaml", "configurations/manager/ubuntu24.yaml"]''',
+    test_config: '''["test-cases/upgrades/manager-upgrade.yaml", "configurations/manager/ubuntu24.yaml", "configurations/disable_client_encrypt.yaml"]''',
 
     post_behavior_db_nodes: 'destroy',
     post_behavior_loader_nodes: 'destroy',

diff --git a/test-cases/manager/manager-backup-restore-set-dataset.yaml b/test-cases/manager/manager-backup-restore-set-dataset.yaml
@@ -14,6 +14,8 @@ n_db_nodes: 3
 n_loaders: 4
 n_monitor_nodes: 1
 
+client_encrypt: true
+
 post_behavior_db_nodes: "destroy"
 post_behavior_loader_nodes: "destroy"
 post_behavior_monitor_nodes: "destroy"

diff --git a/test-cases/manager/manager-installation-set-distro.yaml b/test-cases/manager/manager-installation-set-distro.yaml
@@ -6,4 +6,6 @@ n_db_nodes: 1
 n_loaders: 0
 n_monitor_nodes: 1
 
+client_encrypt: true
+
 user_prefix: manager-installation
diff --git a/test-cases/manager/manager-no-delta-backup-set-dataset.yaml b/test-cases/manager/manager-no-delta-backup-set-dataset.yaml
@@ -11,4 +11,6 @@ n_db_nodes: 3
 n_monitor_nodes: 1
 n_loaders: 1
 
+client_encrypt: true
+
 user_prefix: manager-backup
diff --git a/test-cases/manager/manager-regression-azure.yaml b/test-cases/manager/manager-regression-azure.yaml
@@ -11,6 +11,8 @@ azure_image_monitor: 'RedHat:RHEL:9_5:latest'
 # Default 50 GB value is changed here as the size of the corresponding disk in the VM image: 64 GB
 root_disk_size_monitor: 64
 
+client_encrypt: true
+
 post_behavior_db_nodes: "destroy"
 post_behavior_loader_nodes: "destroy"
 post_behavior_monitor_nodes: "destroy"

diff --git a/test-cases/manager/manager-regression-ipv6.yaml b/test-cases/manager/manager-regression-ipv6.yaml
@@ -11,6 +11,8 @@ n_db_nodes: 3
 n_loaders: 1
 n_monitor_nodes: 1
 
+client_encrypt: true
+
 post_behavior_db_nodes: "destroy"
 post_behavior_loader_nodes: "destroy"
 post_behavior_monitor_nodes: "keep-on-failure"

diff --git a/test-cases/manager/manager-regression-multiDC-gce.yaml b/test-cases/manager/manager-regression-multiDC-gce.yaml
@@ -7,6 +7,8 @@ n_db_nodes: "2 1"
 n_loaders: 1
 n_monitor_nodes: 1
 
+client_encrypt: true
+
 post_behavior_db_nodes: "destroy"
 post_behavior_loader_nodes: "destroy"
 post_behavior_monitor_nodes: "destroy"

diff --git a/test-cases/manager/manager-regression-multiDC-set-distro.yaml b/test-cases/manager/manager-regression-multiDC-set-distro.yaml
@@ -11,6 +11,8 @@ n_db_nodes: '2 1'
 n_loaders: 1
 n_monitor_nodes: 1
 
+client_encrypt: true
+
 post_behavior_db_nodes: "destroy"
 post_behavior_loader_nodes: "destroy"
 post_behavior_monitor_nodes: "destroy"

diff --git a/test-cases/manager/manager-regression-singleDC-set-distro.yaml b/test-cases/manager/manager-regression-singleDC-set-distro.yaml
@@ -11,6 +11,8 @@ n_db_nodes: '3'
 n_loaders: 1
 n_monitor_nodes: 1
 
+client_encrypt: true
+
 post_behavior_db_nodes: "destroy"
 post_behavior_loader_nodes: "destroy"
 post_behavior_monitor_nodes: "destroy"

diff --git a/test-cases/manager/manager-restore-outside.yaml b/test-cases/manager/manager-restore-outside.yaml
@@ -7,6 +7,8 @@ n_db_nodes: 3
 n_monitor_nodes: 1
 n_loaders: 0
 
+client_encrypt: true
+
 mgmt_reuse_backup_snapshot_name: '500gb_1t_ics'
 mgmt_skip_post_restore_stress_read: true
 

diff --git a/test-cases/upgrades/manager-upgrade.yaml b/test-cases/upgrades/manager-upgrade.yaml
@@ -11,6 +11,8 @@ n_db_nodes: '3'
 n_loaders: 1
 n_monitor_nodes: 1
 
+client_encrypt: true
+
 post_behavior_db_nodes: "destroy"
 post_behavior_loader_nodes: "destroy"
 post_behavior_monitor_nodes: "destroy"