Merge branch 'fealebenpae/enterprise-search-snippets' into lsierant/search-snippets-refactor

Author: lsierant

.evergreen.yml

@@ -215,7 +215,7 @@ patch_aliases:
     variant_tags: [ "e2e_smoke_release_test_suite" ]
     task_tags: [ "patch-run" ]
   - alias: "patch-run-cloudqa"
-    variant_tags: [ "cloudqa" ]
+    variant_tags: [ "cloudqa_non_static" ]
     task: ".*"
 
 # Triggered whenever the GitHub PR is created
@@ -1267,7 +1267,7 @@ buildvariants:
   ## MongoDB build variants
   - name: e2e_mdb_kind_ubi_cloudqa
     display_name: e2e_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
     run_on:
       - ubuntu2204-medium
     <<: *base_no_om_image_dependency
@@ -1276,7 +1276,7 @@ buildvariants:
 
   - name: e2e_custom_domain_mdb_kind_ubi_cloudqa
     display_name: e2e_custom_domain_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
     run_on:
       - ubuntu2204-large
     <<: *base_no_om_image_dependency
@@ -1285,7 +1285,7 @@ buildvariants:
 
   - name: e2e_static_mdb_kind_ubi_cloudqa
     display_name: e2e_static_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: [ "e2e_test_suite", "cloudqa", "static" ]
     run_on:
       - ubuntu2204-medium
     <<: *base_no_om_image_dependency
@@ -1294,7 +1294,7 @@ buildvariants:
 
   - name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
     display_name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: [ "e2e_test_suite", "cloudqa", "static" ]
     run_on:
       - ubuntu2204-large
     depends_on:
@@ -1314,7 +1314,7 @@ buildvariants:
 
   - name: e2e_mdb_openshift_ubi_cloudqa
     display_name: e2e_mdb_openshift_ubi_cloudqa
-    tags: [ "e2e_openshift_test_suite", "cloudqa" ]
+    tags: [ "e2e_openshift_test_suite", "cloudqa", "cloudqa_non_static" ]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1334,7 +1334,7 @@ buildvariants:
   # in evergreen for all variants matching e2e_static-*, but we do not want to run openshift variants on every pr.
   - name: e2e_openshift_static_mdb_ubi_cloudqa
     display_name: e2e_openshift_static_mdb_ubi_cloudqa
-    tags: [ "e2e_openshift_test_suite", "cloudqa" ]
+    tags: [ "e2e_openshift_test_suite", "cloudqa", "static" ]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1365,7 +1365,7 @@ buildvariants:
   # Isolated Ops Manager Tests for 6.0 version
   - name: e2e_static_om60_kind_ubi
     display_name: e2e_static_om60_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: [ "e2e_test_suite", "static" ]
     run_on:
       - ubuntu2204-medium
     <<: *base_om6_dependency
@@ -1387,7 +1387,7 @@ buildvariants:
 
   - name: e2e_static_om70_kind_ubi
     display_name: e2e_static_om70_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: [ "e2e_test_suite", "static" ]
     run_on:
       - ubuntu2204-medium
     <<: *base_om7_dependency
@@ -1410,7 +1410,7 @@ buildvariants:
 
   - name: e2e_static_om80_kind_ubi
     display_name: e2e_static_om80_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: [ "e2e_test_suite", "static" ]
     run_on:
       - ubuntu2204-medium
     <<: *base_om8_dependency
@@ -1498,7 +1498,7 @@ buildvariants:
 
   - name: e2e_static_smoke_arm
     display_name: e2e_smoke_arm
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
+    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
     run_on:
       - ubuntu2204-arm64-large
     allowed_requesters: [ "patch", "github_tag" ]
@@ -1508,7 +1508,7 @@ buildvariants:
 
   - name: e2e_static_smoke_ibm_z
     display_name: e2e_static_smoke_ibm_z
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
+    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
     run_on:
       - rhel9-zseries-small
       - rhel9-zseries-large
@@ -1531,7 +1531,7 @@ buildvariants:
 
   - name: e2e_static_smoke_ibm_power
     display_name: e2e_static_smoke_ibm_power
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
+    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
     run_on:
       - rhel9-power-small
       - rhel9-power-large
@@ -1554,7 +1554,7 @@ buildvariants:
 
   - name: e2e_static_smoke
     display_name: e2e_static_smoke
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
+    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
     run_on:
       - ubuntu2204-large
     allowed_requesters: [ "patch", "github_tag" ]
@@ -1566,7 +1566,7 @@ buildvariants:
 
   - name: e2e_multi_cluster_kind
     display_name: e2e_multi_cluster_kind
-    tags: [ "e2e_test_suite", "cloudqa"]
+    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static"]
     run_on:
       - ubuntu2204-large
     <<: *base_om6_dependency
@@ -1575,7 +1575,7 @@ buildvariants:
 
   - name: e2e_static_multi_cluster_kind
     display_name: e2e_static_multi_cluster_kind
-    tags: [ "e2e_test_suite", "cloudqa"]
+    tags: [ "e2e_test_suite", "cloudqa", "static"]
     run_on:
       - ubuntu2204-large
     <<: *base_om6_dependency
@@ -1584,7 +1584,7 @@ buildvariants:
 
   - name: e2e_multi_cluster_2_clusters
     display_name: e2e_multi_cluster_2_clusters
-    tags: [ "e2e_test_suite", "cloudqa"]
+    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static"]
     run_on:
       - ubuntu2204-large
     <<: *base_om6_dependency
@@ -1593,7 +1593,7 @@ buildvariants:
 
   - name: e2e_static_multi_cluster_2_clusters
     display_name: e2e_static_multi_cluster_2_clusters
-    tags: [ "e2e_test_suite", "cloudqa"]
+    tags: [ "e2e_test_suite", "cloudqa", "static"]
     run_on:
       - ubuntu2204-large
     <<: *base_om6_dependency
@@ -1611,7 +1611,7 @@ buildvariants:
 
   - name: e2e_static_multi_cluster_om_appdb
     display_name: e2e_static_multi_cluster_om_appdb
-    tags: [ "e2e_test_suite" ]
+    tags: [ "e2e_test_suite", "static" ]
     run_on:
       - ubuntu2204-large
     <<: *base_om6_dependency
@@ -1631,7 +1631,7 @@ buildvariants:
 
   - name: e2e_operator_kind_ubi_cloudqa
     display_name: e2e_operator_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
     run_on:
       - ubuntu2204-large
     <<: *base_no_om_image_dependency
@@ -1640,7 +1640,7 @@ buildvariants:
 
   - name: e2e_static_operator_kind_ubi_cloudqa
     display_name: e2e_static_operator_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: [ "e2e_test_suite", "cloudqa", "static" ]
     run_on:
       - ubuntu2204-large
     <<: *base_no_om_image_dependency
@@ -1649,7 +1649,7 @@ buildvariants:
 
   - name: e2e_operator_no_webhook_roles_cloudqa
     display_name: e2e_operator_no_webhook_roles_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
     run_on:
       - ubuntu2204-large
     <<: *base_no_om_image_dependency
@@ -1683,7 +1683,7 @@ buildvariants:
 
   - name: e2e_static_kind_olm_ubi
     display_name: e2e_static_kind_olm_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: [ "e2e_test_suite", "static" ]
     run_on:
       - ubuntu2204-large
     depends_on:

.github/workflows/preview_release_notes.yml

@@ -29,8 +29,10 @@ jobs:
         id: generate_release_notes
         run: python -m scripts.release.release_notes -s $INITIAL_COMMIT_SHA -v $INITIAL_VERSION -o release_notes_tmp.md
         env:
-          INITIAL_COMMIT_SHA: ${{ vars.RELEASE_INITIAL_COMMIT_SHA }}
-          INITIAL_VERSION: ${{ vars.RELEASE_INITIAL_VERSION }}
+          # We can not use environments set via GitHub UI because they will
+          # not be available in the pull requests running from forks.
+          INITIAL_COMMIT_SHA: 9ed5f98fc70c5b3442f633d2393265fb8a2aba0c
+          INITIAL_VERSION: 1.3.0
       - name: Add disclaimer to release notes preview
         run: |
           echo -e "_:warning: (this preview might not be accurate if the PR is not rebased on current master branch)_\n" > release_notes_preview.md