Skip to content

Commit d1f1fac

Browse files
akondurakondur
authored
Merge pull request #1409 from splunk/promote-develop-to-main-2.7.0
Merge promote-develop-to-main-2.7.0 back to develop
2 parents 77dbf34 + fccb635 commit d1f1fac

18 files changed

+117
-100
lines changed

‎.github/workflows/build-test-push-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
matrix:
166166
test: [
167167
basic,
168-
appframeworks1,
168+
appframeworksS1,
169169
managerappframeworkc3,
170170
managerappframeworkm4,
171171
managersecret,

‎.github/workflows/int-test-workflow.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,13 @@ jobs:
5555
matrix:
5656
test:
5757
[
58-
appframeworks1,
58+
appframeworksS1,
5959
managerappframeworkc3,
6060
managerappframeworkm4,
6161
managersecret,
6262
managersmartstore,
63-
managermc,
63+
managermc1,
64+
managermc2,
6465
managercrcrud,
6566
licensemanager,
6667
managerdeletecr,

‎.github/workflows/manual-int-test-workflow.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ jobs:
1313
matrix:
1414
test:
1515
[
16-
appframeworks1,
16+
appframeworksS1,
1717
managerappframeworkc3,
1818
managerappframeworkm4,
1919
managersecret,
2020
managersmartstore,
21-
managermc,
21+
managermc1,
22+
managermc2,
2223
managerscaling,
2324
managercrcrud,
2425
licensemanager,

‎.github/workflows/namespace-scope-int-workflow.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ jobs:
99
matrix:
1010
test:
1111
[
12-
appframeworks1,
12+
appframeworksS1,
1313
managerappframeworkc3,
1414
managerappframeworkm4,
1515
managersecret,
1616
managersmartstore,
17-
managermc,
17+
managermc1,
18+
managermc2,
1819
managerscaling,
1920
managercrcrud,
2021
licensemanager,

‎.github/workflows/nightly-int-test-workflow.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,13 @@ jobs:
5353
matrix:
5454
test:
5555
[
56-
appframeworks1,
56+
appframeworksS1,
5757
managerappframeworkc3,
5858
managerappframeworkm4,
5959
managersecret,
6060
managersmartstore,
61-
managermc,
61+
managermc1,
62+
managermc2,
6263
managerscaling,
6364
managercrcrud,
6465
licensemanager,

‎pkg/splunk/client/azureblobclient.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ func NewAzureBlobClient(
138138
var serviceURL string
139139
if endpoint != "" {
140140
serviceURL = endpoint
141+
if serviceURL[len(serviceURL)-1] == '/' {
142+
serviceURL = serviceURL[:len(serviceURL)-1]
143+
}
141144
} else if region != "" {
142145
serviceURL = fmt.Sprintf("https://%s.blob.%s.core.windows.net", storageAccountName, region)
143146
} else {
@@ -203,7 +206,7 @@ func NewAzureBlobClient(
203206

204207
// Initialize the container client with Token Credential.
205208
rawContainerClient, err := container.NewClient(
206-
fmt.Sprintf("%s%s", serviceURL, bucketName),
209+
fmt.Sprintf("%s/%s", serviceURL, bucketName),
207210
tokenCredential,
208211
nil,
209212
)

‎test/appframework_aws/c3/appframework_aws_suite_test.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ func TestBasic(t *testing.T) {
6060
}
6161
RegisterFailHandler(Fail)
6262

63-
RunSpecs(t, "Running "+testSuiteName)
63+
sc, _ := GinkgoConfiguration()
64+
sc.Timeout = 240 * time.Minute
65+
66+
RunSpecs(t, "Running "+testSuiteName, sc)
6467
}
6568

6669
//func TestMain(m *testing.M) {

‎test/appframework_aws/m4/appframework_aws_suite_test.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ func TestBasic(t *testing.T) {
5555

5656
RegisterFailHandler(Fail)
5757

58-
RunSpecs(t, "Running "+testSuiteName)
58+
sc, _ := GinkgoConfiguration()
59+
sc.Timeout = 240 * time.Minute
60+
61+
RunSpecs(t, "Running "+testSuiteName, sc)
5962
}
6063

6164
var _ = BeforeSuite(func() {

‎test/appframework_aws/s1/appframework_aws_test.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ var _ = Describe("s1appfw test", func() {
7979
})
8080

8181
Context("Standalone deployment (S1) with App Framework", func() {
82-
It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() {
82+
It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() {
8383

8484
/* Test Steps
8585
################## SETUP ####################
@@ -250,7 +250,7 @@ var _ = Describe("s1appfw test", func() {
250250
})
251251

252252
Context("Standalone deployment (S1) with App Framework", func() {
253-
It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() {
253+
It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() {
254254

255255
/* Test Steps
256256
################## SETUP ####################
@@ -413,7 +413,7 @@ var _ = Describe("s1appfw test", func() {
413413
})
414414

415415
Context("Standalone deployment (S1) with App Framework", func() {
416-
It("s1, smoke, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() {
416+
It("s1, smoke, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() {
417417

418418
/* Test Steps
419419
################## SETUP ####################
@@ -608,7 +608,7 @@ var _ = Describe("s1appfw test", func() {
608608
})
609609

610610
Context("Standalone deployment (S1) with App Framework", func() {
611-
It("s1, integration, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() {
611+
It("s1, integration, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() {
612612

613613
/* Test Steps
614614
################## SETUP ####################
@@ -742,7 +742,7 @@ var _ = Describe("s1appfw test", func() {
742742

743743
// ES App Installation not supported at the time. Will be added back at a later time.
744744
Context("Standalone deployment (S1) with App Framework", func() {
745-
It("s1, integration, appframeworks1, appframework: can deploy a Standalone and have ES app installed", func() {
745+
It("s1, integration, appframeworksS1, appframework: can deploy a Standalone and have ES app installed", func() {
746746

747747
/* Test Steps
748748
################## SETUP ####################
@@ -843,7 +843,7 @@ var _ = Describe("s1appfw test", func() {
843843
})
844844

845845
Context("Standalone deployment (S1) with App Framework", func() {
846-
It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() {
846+
It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() {
847847

848848
/* Test Steps
849849
################## SETUP ####################
@@ -912,7 +912,7 @@ var _ = Describe("s1appfw test", func() {
912912
})
913913

914914
Context("Standalone deployment (S1) with App Framework", func() {
915-
It("s1, smoke, appframeworks1, appframework: can deploy a standalone instance with App Framework enabled for manual poll", func() {
915+
It("s1, smoke, appframeworksS1, appframework: can deploy a standalone instance with App Framework enabled for manual poll", func() {
916916

917917
/* Test Steps
918918
################## SETUP ####################
@@ -1090,7 +1090,7 @@ var _ = Describe("s1appfw test", func() {
10901090
})
10911091

10921092
Context("Standalone deployment (S1) with App Framework", func() {
1093-
It("integration, s1, appframeworks1, appframework: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() {
1093+
It("integration, s1, appframeworksS1, appframework: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() {
10941094

10951095
/* Test Steps
10961096
################## SETUP ####################
@@ -1191,7 +1191,7 @@ var _ = Describe("s1appfw test", func() {
11911191
})
11921192

11931193
Context("Standalone deployment (S1) with App Framework", func() {
1194-
It("integration, s1, appframeworks1, appframework: can add new apps to app source while install is in progress and have all apps installed", func() {
1194+
It("integration, s1, appframeworksS1, appframework: can add new apps to app source while install is in progress and have all apps installed", func() {
11951195

11961196
/* Test Steps
11971197
################## SETUP ####################
@@ -1303,7 +1303,7 @@ var _ = Describe("s1appfw test", func() {
13031303
})
13041304

13051305
Context("Standalone deployment (S1) with App Framework", func() {
1306-
It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() {
1306+
It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() {
13071307

13081308
/* Test Steps
13091309
################## SETUP ####################
@@ -1399,7 +1399,7 @@ var _ = Describe("s1appfw test", func() {
13991399
})
14001400

14011401
Context("Standalone deployment (S1) with App Framework", func() {
1402-
It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() {
1402+
It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() {
14031403

14041404
/* Test Steps
14051405
################## SETUP ####################
@@ -1467,7 +1467,7 @@ var _ = Describe("s1appfw test", func() {
14671467
})
14681468

14691469
Context("Standalone deployment (S1) with App Framework", func() {
1470-
It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() {
1470+
It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() {
14711471

14721472
/* Test Steps
14731473
################## SETUP ####################
@@ -1561,7 +1561,7 @@ var _ = Describe("s1appfw test", func() {
15611561
})
15621562

15631563
Context("Standalone deployment (S1) with App Framework", func() {
1564-
It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect S3 credentials", func() {
1564+
It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect S3 credentials", func() {
15651565

15661566
/* Test Steps
15671567
################## SETUP ####################
@@ -1698,7 +1698,7 @@ var _ = Describe("s1appfw test", func() {
16981698
})
16991699

17001700
Context("Standalone deployment (S1) with App Framework", func() {
1701-
It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() {
1701+
It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() {
17021702

17031703
/* Test Steps
17041704
################## SETUP ####################
@@ -1782,7 +1782,7 @@ var _ = Describe("s1appfw test", func() {
17821782
})
17831783

17841784
Context("Standalone deployment (S1) with App Framework", func() {
1785-
It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() {
1785+
It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() {
17861786

17871787
/* Test Steps
17881788
################## SETUP ####################
@@ -1857,7 +1857,7 @@ var _ = Describe("s1appfw test", func() {
18571857
})
18581858

18591859
Context("Standalone deployment (S1) with App Framework", func() {
1860-
It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() {
1860+
It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() {
18611861

18621862
/* Test Steps
18631863
################## SETUP ####################
@@ -1928,7 +1928,7 @@ var _ = Describe("s1appfw test", func() {
19281928
})
19291929

19301930
Context("Standalone deployment (S1) with App Framework", func() {
1931-
It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() {
1931+
It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() {
19321932

19331933
/* Test Steps
19341934
################## SETUP ####################

‎test/appframework_gcp/c3/appframework_gcs_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
//"encoding/json"
1919
"fmt"
2020
"path/filepath"
21+
2122
//"strings"
2223
//"time"
2324

@@ -89,7 +90,7 @@ var _ = Describe("c3appfw test", func() {
8990
})
9091

9192
Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() {
92-
It(" c3gcp, masterappframeworkc3gcp, appframeworkgcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade them", func() {
93+
It(" c3gcp, masterappframeworkc3gcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade them", func() {
9394

9495
/* Test Steps
9596
################## SETUP ####################
@@ -308,7 +309,7 @@ var _ = Describe("c3appfw test", func() {
308309
})
309310

310311
Context("Single Site Indexer Cluster with Search Head Cluster (C3) with App Framework", func() {
311-
It(" c3gcp, masterappframeworkc3gcp, appframeworkgcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then downgrade them", func() {
312+
It(" c3gcp, masterappframeworkc3gcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then downgrade them", func() {
312313

313314
/* Test Steps
314315
################## SETUP ####################
@@ -515,7 +516,7 @@ var _ = Describe("c3appfw test", func() {
515516
})
516517

517518
Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() {
518-
It(" c3gcp, masterappframeworkc3gcp, appframeworkgcp, c3_gcp_sanity: can deploy a C3 SVA and have apps installed locally on Cluster Manager and Deployer", func() {
519+
It(" c3gcp, masterappframeworkc3gcp, c3_gcp_sanity: can deploy a C3 SVA and have apps installed locally on Cluster Manager and Deployer", func() {
519520

520521
/* Test Steps
521522
################## SETUP ####################
@@ -654,7 +655,7 @@ var _ = Describe("c3appfw test", func() {
654655
})
655656

656657
Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() {
657-
It(" c3gcp, masterappframeworkc3gcp, appframeworkgcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled and check isDeploymentInProgressFlag for CM and SHC CR's", func() {
658+
It(" c3gcp, masterappframeworkc3gcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled and check isDeploymentInProgressFlag for CM and SHC CR's", func() {
658659

659660
/*
660661
Test Steps

0 commit comments

Comments
 (0)