Skip to content

Commit aca9ee3

Browse files
committed
Merge branch 'search/public-preview' into fealebenpae/enterprise-search
2 parents f783f5d + 2e5a426 commit aca9ee3

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

.evergreen.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ patch_aliases:
236236
variant_tags: [ "e2e_smoke_release_test_suite" ]
237237
task_tags: [ "patch-run" ]
238238
- alias: "patch-run-cloudqa"
239-
variant_tags: [ "cloudqa" ]
239+
variant_tags: [ "cloudqa_non_static" ]
240240
task: ".*"
241241

242242
# Triggered whenever the GitHub PR is created
@@ -1301,7 +1301,7 @@ buildvariants:
13011301
## MongoDB build variants
13021302
- name: e2e_mdb_kind_ubi_cloudqa
13031303
display_name: e2e_mdb_kind_ubi_cloudqa
1304-
tags: [ "e2e_test_suite", "cloudqa" ]
1304+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
13051305
run_on:
13061306
- ubuntu2204-medium
13071307
<<: *base_no_om_image_dependency
@@ -1310,7 +1310,7 @@ buildvariants:
13101310

13111311
- name: e2e_custom_domain_mdb_kind_ubi_cloudqa
13121312
display_name: e2e_custom_domain_mdb_kind_ubi_cloudqa
1313-
tags: [ "e2e_test_suite", "cloudqa" ]
1313+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
13141314
run_on:
13151315
- ubuntu2204-large
13161316
<<: *base_no_om_image_dependency
@@ -1319,7 +1319,7 @@ buildvariants:
13191319

13201320
- name: e2e_static_mdb_kind_ubi_cloudqa
13211321
display_name: e2e_static_mdb_kind_ubi_cloudqa
1322-
tags: [ "e2e_test_suite", "cloudqa" ]
1322+
tags: [ "e2e_test_suite", "cloudqa", "static" ]
13231323
run_on:
13241324
- ubuntu2204-medium
13251325
<<: *base_no_om_image_dependency
@@ -1328,7 +1328,7 @@ buildvariants:
13281328

13291329
- name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
13301330
display_name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
1331-
tags: [ "e2e_test_suite", "cloudqa" ]
1331+
tags: [ "e2e_test_suite", "cloudqa", "static" ]
13321332
run_on:
13331333
- ubuntu2204-large
13341334
depends_on:
@@ -1348,7 +1348,7 @@ buildvariants:
13481348

13491349
- name: e2e_mdb_openshift_ubi_cloudqa
13501350
display_name: e2e_mdb_openshift_ubi_cloudqa
1351-
tags: [ "e2e_openshift_test_suite", "cloudqa" ]
1351+
tags: [ "e2e_openshift_test_suite", "cloudqa", "cloudqa_non_static" ]
13521352
depends_on:
13531353
- name: build_operator_ubi
13541354
variant: init_test_run
@@ -1368,7 +1368,7 @@ buildvariants:
13681368
# in evergreen for all variants matching e2e_static-*, but we do not want to run openshift variants on every pr.
13691369
- name: e2e_openshift_static_mdb_ubi_cloudqa
13701370
display_name: e2e_openshift_static_mdb_ubi_cloudqa
1371-
tags: [ "e2e_openshift_test_suite", "cloudqa" ]
1371+
tags: [ "e2e_openshift_test_suite", "cloudqa", "static" ]
13721372
depends_on:
13731373
- name: build_operator_ubi
13741374
variant: init_test_run
@@ -1399,7 +1399,7 @@ buildvariants:
13991399
# Isolated Ops Manager Tests for 6.0 version
14001400
- name: e2e_static_om60_kind_ubi
14011401
display_name: e2e_static_om60_kind_ubi
1402-
tags: [ "e2e_test_suite" ]
1402+
tags: [ "e2e_test_suite", "static" ]
14031403
run_on:
14041404
- ubuntu2204-medium
14051405
<<: *base_om6_dependency
@@ -1421,7 +1421,7 @@ buildvariants:
14211421

14221422
- name: e2e_static_om70_kind_ubi
14231423
display_name: e2e_static_om70_kind_ubi
1424-
tags: [ "e2e_test_suite" ]
1424+
tags: [ "e2e_test_suite", "static" ]
14251425
run_on:
14261426
- ubuntu2204-medium
14271427
<<: *base_om7_dependency
@@ -1444,7 +1444,7 @@ buildvariants:
14441444

14451445
- name: e2e_static_om80_kind_ubi
14461446
display_name: e2e_static_om80_kind_ubi
1447-
tags: [ "e2e_test_suite" ]
1447+
tags: [ "e2e_test_suite", "static" ]
14481448
run_on:
14491449
- ubuntu2204-medium
14501450
<<: *base_om8_dependency
@@ -1532,7 +1532,7 @@ buildvariants:
15321532

15331533
- name: e2e_static_smoke_arm
15341534
display_name: e2e_smoke_arm
1535-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1535+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15361536
run_on:
15371537
- ubuntu2204-arm64-large
15381538
allowed_requesters: [ "patch", "github_tag" ]
@@ -1542,7 +1542,7 @@ buildvariants:
15421542

15431543
- name: e2e_static_smoke_ibm_z
15441544
display_name: e2e_static_smoke_ibm_z
1545-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1545+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15461546
run_on:
15471547
- rhel9-zseries-small
15481548
- rhel9-zseries-large
@@ -1565,7 +1565,7 @@ buildvariants:
15651565

15661566
- name: e2e_static_smoke_ibm_power
15671567
display_name: e2e_static_smoke_ibm_power
1568-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1568+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15691569
run_on:
15701570
- rhel9-power-small
15711571
- rhel9-power-large
@@ -1588,7 +1588,7 @@ buildvariants:
15881588

15891589
- name: e2e_static_smoke
15901590
display_name: e2e_static_smoke
1591-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1591+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15921592
run_on:
15931593
- ubuntu2204-large
15941594
allowed_requesters: [ "patch", "github_tag" ]
@@ -1600,7 +1600,7 @@ buildvariants:
16001600

16011601
- name: e2e_multi_cluster_kind
16021602
display_name: e2e_multi_cluster_kind
1603-
tags: [ "e2e_test_suite", "cloudqa"]
1603+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static"]
16041604
run_on:
16051605
- ubuntu2204-large
16061606
<<: *base_om6_dependency
@@ -1609,7 +1609,7 @@ buildvariants:
16091609

16101610
- name: e2e_static_multi_cluster_kind
16111611
display_name: e2e_static_multi_cluster_kind
1612-
tags: [ "e2e_test_suite", "cloudqa"]
1612+
tags: [ "e2e_test_suite", "cloudqa", "static"]
16131613
run_on:
16141614
- ubuntu2204-large
16151615
<<: *base_om6_dependency
@@ -1618,7 +1618,7 @@ buildvariants:
16181618

16191619
- name: e2e_multi_cluster_2_clusters
16201620
display_name: e2e_multi_cluster_2_clusters
1621-
tags: [ "e2e_test_suite", "cloudqa"]
1621+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static"]
16221622
run_on:
16231623
- ubuntu2204-large
16241624
<<: *base_om6_dependency
@@ -1627,7 +1627,7 @@ buildvariants:
16271627

16281628
- name: e2e_static_multi_cluster_2_clusters
16291629
display_name: e2e_static_multi_cluster_2_clusters
1630-
tags: [ "e2e_test_suite", "cloudqa"]
1630+
tags: [ "e2e_test_suite", "cloudqa", "static"]
16311631
run_on:
16321632
- ubuntu2204-large
16331633
<<: *base_om6_dependency
@@ -1645,7 +1645,7 @@ buildvariants:
16451645

16461646
- name: e2e_static_multi_cluster_om_appdb
16471647
display_name: e2e_static_multi_cluster_om_appdb
1648-
tags: [ "e2e_test_suite" ]
1648+
tags: [ "e2e_test_suite", "static" ]
16491649
run_on:
16501650
- ubuntu2204-large
16511651
<<: *base_om6_dependency
@@ -1665,7 +1665,7 @@ buildvariants:
16651665

16661666
- name: e2e_operator_kind_ubi_cloudqa
16671667
display_name: e2e_operator_kind_ubi_cloudqa
1668-
tags: [ "e2e_test_suite", "cloudqa" ]
1668+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
16691669
run_on:
16701670
- ubuntu2204-large
16711671
<<: *base_no_om_image_dependency
@@ -1674,7 +1674,7 @@ buildvariants:
16741674

16751675
- name: e2e_static_operator_kind_ubi_cloudqa
16761676
display_name: e2e_static_operator_kind_ubi_cloudqa
1677-
tags: [ "e2e_test_suite", "cloudqa" ]
1677+
tags: [ "e2e_test_suite", "cloudqa", "static" ]
16781678
run_on:
16791679
- ubuntu2204-large
16801680
<<: *base_no_om_image_dependency
@@ -1683,7 +1683,7 @@ buildvariants:
16831683

16841684
- name: e2e_operator_no_webhook_roles_cloudqa
16851685
display_name: e2e_operator_no_webhook_roles_cloudqa
1686-
tags: [ "e2e_test_suite", "cloudqa" ]
1686+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
16871687
run_on:
16881688
- ubuntu2204-large
16891689
<<: *base_no_om_image_dependency
@@ -1717,7 +1717,7 @@ buildvariants:
17171717

17181718
- name: e2e_static_kind_olm_ubi
17191719
display_name: e2e_static_kind_olm_ubi
1720-
tags: [ "e2e_test_suite" ]
1720+
tags: [ "e2e_test_suite", "static" ]
17211721
run_on:
17221722
- ubuntu2204-large
17231723
depends_on:

.github/workflows/preview_release_notes.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ jobs:
2929
id: generate_release_notes
3030
run: python -m scripts.release.release_notes -s $INITIAL_COMMIT_SHA -v $INITIAL_VERSION -o release_notes_tmp.md
3131
env:
32-
INITIAL_COMMIT_SHA: ${{ vars.RELEASE_INITIAL_COMMIT_SHA }}
33-
INITIAL_VERSION: ${{ vars.RELEASE_INITIAL_VERSION }}
32+
# We can not use environments set via GitHub UI because they will
33+
# not be available in the pull requests running from forks.
34+
INITIAL_COMMIT_SHA: 9ed5f98fc70c5b3442f633d2393265fb8a2aba0c
35+
INITIAL_VERSION: 1.3.0
3436
- name: Add disclaimer to release notes preview
3537
run: |
3638
echo -e "_:warning: (this preview might not be accurate if the PR is not rebased on current master branch)_\n" > release_notes_preview.md

0 commit comments

Comments
 (0)