From 5dfca76fbb29b6b340c954a46395b43e0f45eb6b Mon Sep 17 00:00:00 2001
From: kcrodgers24 <kcrodgers@live.com>
Date: Thu, 6 Jan 2022 09:29:03 -0800
Subject: [PATCH 1/2] correct TLS enabled check

---
 server/server.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/server.go b/server/server.go
index 43b60f8f9..66b85ff7b 100644
--- a/server/server.go
+++ b/server/server.go
@@ -557,7 +557,7 @@ func (m *Command) SetupServer() error {
 		m.Config.Postgres.Bind = ""
 
 		// TLS must be enabled if auth is
-		if m.Config.TLS.CertificatePath == "" || m.Config.TLS.CertificateKeyPath == "" || m.Config.TLS.CACertPath == "" {
+		if m.Config.TLS.CertificatePath == "" || m.Config.TLS.CertificateKeyPath == "" {
 			return fmt.Errorf("transport layer security (TLS) is not configured properly. TLS is required when AuthN/Z is enabled, current configuration: %v", m.Config.TLS)
 		}
 

From 1e2aa7c807ce58926b246df3061390f00060d1db Mon Sep 17 00:00:00 2001
From: Fletcher Haynes <fletcher.haynes@molecula.com>
Date: Thu, 6 Jan 2022 10:36:20 -0800
Subject: [PATCH 2/2] Changed smoke test to allow failure

---
 .gitlab/.gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index c32893e8c..672c82a61 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -262,6 +262,7 @@ smoke test:
     - ./qa/scripts/teardownSmokeTest.sh
   needs:
     - job: build for linux arm64
+  allow_failure: true
   artifacts:
     when: always
     paths:
@@ -314,4 +315,4 @@ gauntlet:
     - ./qa/scripts/setupSamsungGauntlet.sh
     - ./qa/scripts/testSamsungGauntlet.sh
   after_script:
-    - ./qa/scripts/teardownSamsungGauntlet.sh
\ No newline at end of file
+    - ./qa/scripts/teardownSamsungGauntlet.sh