set hard coded collector app endpoint

redhat-best-practices-for-k8s · Jan 25, 2024 · 213e1bb · 213e1bb
1 parent 0cf057b
commit 213e1bb
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/pre-main.yaml b/.github/workflows/pre-main.yaml
@@ -404,6 +404,9 @@ jobs:
       - name: 'Test: Run Smoke Tests in a TNF container'
         run: TNF_LOG_LEVEL=${TNF_SMOKE_TESTS_LOG_LEVEL} TNF_ENABLE_DATA_COLLECTION=true ./run-tnf-container.sh ${{ env.TESTING_CMD_PARAMS }} -l "${SMOKE_TESTS_LABELS_FILTER}"
 
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+
       - name: Run sanity check on collector
         uses: ./collector/.github/actions/run-sanity-check
         with:

diff --git a/cnf-certification-test/tnf_config.yml b/cnf-certification-test/tnf_config.yml
@@ -35,7 +35,6 @@ servicesignorelist:
   - "hazelcast-platform-webhook-service"
   - "new-pro-controller-manager-metrics-service"
   - "mysql"
-collectorAppEndPoint: ""
 executedBy: ""
 partnerName: ""
 collectorAppPassword: ""
diff --git a/cnf-certification-test/webserver/webserver.go b/cnf-certification-test/webserver/webserver.go
@@ -393,9 +393,6 @@ func updateTnf(tnfConfig []byte, data *RequestedData) []byte {
 	if len(data.CollectorAppEndPoint) > 0 {
 		config.CollectorAppEndPoint = data.CollectorAppEndPoint[0]
 	}
-	if len(data.CollectorAppPassword) > 0 {
-		config.CollectorAppPassword = data.CollectorAppPassword[0]
-	}
 	if len(data.ExecutedBy) > 0 {
 		config.ExecutedBy = data.ExecutedBy[0]
 	}

diff --git a/pkg/autodiscover/autodiscover.go b/pkg/autodiscover/autodiscover.go
@@ -92,7 +92,6 @@ type DiscoveredTestData struct {
 	CollectorAppEndPoint   string
 	ExecutedBy             string
 	PartnerName            string
-	CollectorAppPassword   string
 }
 
 type labelObject struct {
@@ -251,7 +250,6 @@ func DoAutoDiscover(config *configuration.TestConfiguration) DiscoveredTestData
 	data.CollectorAppEndPoint = config.CollectorAppEndPoint
 	data.ExecutedBy = config.ExecutedBy
 	data.PartnerName = config.PartnerName
-	data.CollectorAppPassword = config.CollectorAppPassword
 
 	return data
 }

diff --git a/pkg/certsuite/certsuite.go b/pkg/certsuite/certsuite.go
@@ -46,7 +46,8 @@ func LoadChecksDB(labelsExpr string) {
 }
 
 const (
-	junitXMLOutputFile = "cnf-certification-tests_junit.xml"
+	junitXMLOutputFile   = "cnf-certification-tests_junit.xml"
+	collectorAppEndPoint = "http://44.195.143.94"
 )
 
 func getK8sClientsConfigFileNames() []string {
@@ -150,7 +151,7 @@ func Run(labelsFilter, outputFolder string) error {
 
 	// Send claim file to the collector if specified by env var
 	if configuration.GetTestParameters().EnableDataCollection {
-		err = collector.SendClaimFileToCollector(env.CollectorAppEndPoint, claimOutputFile, env.ExecutedBy, env.PartnerName, env.CollectorAppPassword)
+		err = collector.SendClaimFileToCollector(env.CollectorAppEndPoint, claimOutputFile, env.ExecutedBy, env.PartnerName, collectorAppEndPoint)
 		if err != nil {
 			log.Error("Failed to send post request to the collector: %v", err)
 		}

diff --git a/pkg/configuration/configuration.go b/pkg/configuration/configuration.go
@@ -89,7 +89,6 @@ type TestConfiguration struct {
 	CollectorAppEndPoint string `yaml:"collectorAppEndPoint,omitempty" json:"collectorAppEndPoint,omitempty"`
 	ExecutedBy           string `yaml:"executedBy,omitempty" json:"executedBy,omitempty"`
 	PartnerName          string `yaml:"partnerName,omitempty" json:"partnerName,omitempty"`
-	CollectorAppPassword string `yaml:"collectorAppPassword,omitempty" json:"collectorAppPassword,omitempty"`
 }
 
 type TestParameters struct {

diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go
@@ -119,7 +119,6 @@ type TestEnvironment struct { // rename this with testTarget
 	CollectorAppEndPoint   string
 	ExecutedBy             string
 	PartnerName            string
-	CollectorAppPassword   string
 }
 
 type MachineConfig struct {
@@ -298,7 +297,6 @@ func buildTestEnvironment() { //nolint:funlen
 	env.CollectorAppEndPoint = data.CollectorAppEndPoint
 	env.ExecutedBy = data.ExecutedBy
 	env.PartnerName = data.PartnerName
-	env.CollectorAppPassword = data.CollectorAppPassword
 
 	operators := createOperators(data.Csvs, data.Subscriptions, data.AllInstallPlans, data.AllCatalogSources, false, true)
 	env.Operators = operators