Merge pull request #6959 from slashpai/prom3

.github/workflow: Fix prometheus 3 tests

.github/workflows/e2e-prometheus3.yaml

@@ -1,12 +1,16 @@
 name: e2e-prometheus3
+
 on:
   schedule:
     - cron:  '30 14 * * *' # Every day 14:30
+
 jobs:
   e2e-tests:
     name: E2E experimental version tests
     runs-on: ubuntu-latest
     strategy:
+      # since upgrade test was failing other tests were cancelled, setting this so that other test run
+      fail-fast: false
       matrix:
         suite: [alertmanager, prometheus, prometheusAllNS, thanosruler, operatorUpgrade]
         include:

test/framework/prometheus.go

@@ -179,7 +179,8 @@ func (f *Framework) CreateCertificateResources(namespace, certsDir string, prwtc
 
 func (f *Framework) MakeBasicPrometheus(ns, name, group string, replicas int32) *monitoringv1.Prometheus {
 	promVersion := operator.DefaultPrometheusVersion
-	if os.Getenv("TEST_EXPERIMENTAL_PROMETHEUS") == "true" {
+	// Because Prometheus 3 is supported from version 0.77.0 only
+	if os.Getenv("TEST_EXPERIMENTAL_PROMETHEUS") == "true" && f.operatorVersion.Minor >= 77 {
 		promVersion = operator.DefaultPrometheusExperimentalVersion
 	}
 	return &monitoringv1.Prometheus{
@@ -289,8 +290,7 @@ func (prwtc PromRemoteWriteTestConfig) AddRemoteWriteWithTLSToPrometheus(p *moni
 }
 
 func (f *Framework) EnableRemoteWriteReceiverWithTLS(p *monitoringv1.Prometheus) {
-	p.Spec.EnableFeatures = []monitoringv1.EnableFeature{"remote-write-receiver"}
-
+	p.Spec.EnableRemoteWriteReceiver = true
 	p.Spec.Web = &monitoringv1.PrometheusWebSpec{
 		WebConfigFileFields: monitoringv1.WebConfigFileFields{
 			TLSConfig: &monitoringv1.WebTLSConfig{