Skip to content

Commit 90ac29e

Browse files
committed
Merge branch 'search/public-preview' into fealebenpae/enterprise-search
2 parents 7bf4672 + 2e5a426 commit 90ac29e

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
@@ -239,7 +239,7 @@ patch_aliases:
239239
variant_tags: [ "e2e_smoke_release_test_suite" ]
240240
task_tags: [ "patch-run" ]
241241
- alias: "patch-run-cloudqa"
242-
variant_tags: [ "cloudqa" ]
242+
variant_tags: [ "cloudqa_non_static" ]
243243
task: ".*"
244244

245245
# Triggered whenever the GitHub PR is created
@@ -1305,7 +1305,7 @@ buildvariants:
13051305
## MongoDB build variants
13061306
- name: e2e_mdb_kind_ubi_cloudqa
13071307
display_name: e2e_mdb_kind_ubi_cloudqa
1308-
tags: [ "e2e_test_suite", "cloudqa" ]
1308+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
13091309
run_on:
13101310
- ubuntu2204-medium
13111311
<<: *base_no_om_image_dependency
@@ -1314,7 +1314,7 @@ buildvariants:
13141314

13151315
- name: e2e_custom_domain_mdb_kind_ubi_cloudqa
13161316
display_name: e2e_custom_domain_mdb_kind_ubi_cloudqa
1317-
tags: [ "e2e_test_suite", "cloudqa" ]
1317+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
13181318
run_on:
13191319
- ubuntu2204-large
13201320
<<: *base_no_om_image_dependency
@@ -1323,7 +1323,7 @@ buildvariants:
13231323

13241324
- name: e2e_static_mdb_kind_ubi_cloudqa
13251325
display_name: e2e_static_mdb_kind_ubi_cloudqa
1326-
tags: [ "e2e_test_suite", "cloudqa" ]
1326+
tags: [ "e2e_test_suite", "cloudqa", "static" ]
13271327
run_on:
13281328
- ubuntu2204-medium
13291329
<<: *base_no_om_image_dependency
@@ -1332,7 +1332,7 @@ buildvariants:
13321332

13331333
- name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
13341334
display_name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
1335-
tags: [ "e2e_test_suite", "cloudqa" ]
1335+
tags: [ "e2e_test_suite", "cloudqa", "static" ]
13361336
run_on:
13371337
- ubuntu2204-large
13381338
depends_on:
@@ -1352,7 +1352,7 @@ buildvariants:
13521352

13531353
- name: e2e_mdb_openshift_ubi_cloudqa
13541354
display_name: e2e_mdb_openshift_ubi_cloudqa
1355-
tags: [ "e2e_openshift_test_suite", "cloudqa" ]
1355+
tags: [ "e2e_openshift_test_suite", "cloudqa", "cloudqa_non_static" ]
13561356
depends_on:
13571357
- name: build_operator_ubi
13581358
variant: init_test_run
@@ -1372,7 +1372,7 @@ buildvariants:
13721372
# in evergreen for all variants matching e2e_static-*, but we do not want to run openshift variants on every pr.
13731373
- name: e2e_openshift_static_mdb_ubi_cloudqa
13741374
display_name: e2e_openshift_static_mdb_ubi_cloudqa
1375-
tags: [ "e2e_openshift_test_suite", "cloudqa" ]
1375+
tags: [ "e2e_openshift_test_suite", "cloudqa", "static" ]
13761376
depends_on:
13771377
- name: build_operator_ubi
13781378
variant: init_test_run
@@ -1403,7 +1403,7 @@ buildvariants:
14031403
# Isolated Ops Manager Tests for 6.0 version
14041404
- name: e2e_static_om60_kind_ubi
14051405
display_name: e2e_static_om60_kind_ubi
1406-
tags: [ "e2e_test_suite" ]
1406+
tags: [ "e2e_test_suite", "static" ]
14071407
run_on:
14081408
- ubuntu2204-medium
14091409
<<: *base_om6_dependency
@@ -1425,7 +1425,7 @@ buildvariants:
14251425

14261426
- name: e2e_static_om70_kind_ubi
14271427
display_name: e2e_static_om70_kind_ubi
1428-
tags: [ "e2e_test_suite" ]
1428+
tags: [ "e2e_test_suite", "static" ]
14291429
run_on:
14301430
- ubuntu2204-medium
14311431
<<: *base_om7_dependency
@@ -1448,7 +1448,7 @@ buildvariants:
14481448

14491449
- name: e2e_static_om80_kind_ubi
14501450
display_name: e2e_static_om80_kind_ubi
1451-
tags: [ "e2e_test_suite" ]
1451+
tags: [ "e2e_test_suite", "static" ]
14521452
run_on:
14531453
- ubuntu2204-medium
14541454
<<: *base_om8_dependency
@@ -1536,7 +1536,7 @@ buildvariants:
15361536

15371537
- name: e2e_static_smoke_arm
15381538
display_name: e2e_smoke_arm
1539-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1539+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15401540
run_on:
15411541
- ubuntu2204-arm64-large
15421542
allowed_requesters: [ "patch", "github_tag" ]
@@ -1546,7 +1546,7 @@ buildvariants:
15461546

15471547
- name: e2e_static_smoke_ibm_z
15481548
display_name: e2e_static_smoke_ibm_z
1549-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1549+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15501550
run_on:
15511551
- rhel9-zseries-small
15521552
- rhel9-zseries-large
@@ -1569,7 +1569,7 @@ buildvariants:
15691569

15701570
- name: e2e_static_smoke_ibm_power
15711571
display_name: e2e_static_smoke_ibm_power
1572-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1572+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15731573
run_on:
15741574
- rhel9-power-small
15751575
- rhel9-power-large
@@ -1592,7 +1592,7 @@ buildvariants:
15921592

15931593
- name: e2e_static_smoke
15941594
display_name: e2e_static_smoke
1595-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1595+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15961596
run_on:
15971597
- ubuntu2204-large
15981598
allowed_requesters: [ "patch", "github_tag" ]
@@ -1604,7 +1604,7 @@ buildvariants:
16041604

16051605
- name: e2e_multi_cluster_kind
16061606
display_name: e2e_multi_cluster_kind
1607-
tags: [ "e2e_test_suite", "cloudqa"]
1607+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static"]
16081608
run_on:
16091609
- ubuntu2204-large
16101610
<<: *base_om6_dependency
@@ -1613,7 +1613,7 @@ buildvariants:
16131613

16141614
- name: e2e_static_multi_cluster_kind
16151615
display_name: e2e_static_multi_cluster_kind
1616-
tags: [ "e2e_test_suite", "cloudqa"]
1616+
tags: [ "e2e_test_suite", "cloudqa", "static"]
16171617
run_on:
16181618
- ubuntu2204-large
16191619
<<: *base_om6_dependency
@@ -1622,7 +1622,7 @@ buildvariants:
16221622

16231623
- name: e2e_multi_cluster_2_clusters
16241624
display_name: e2e_multi_cluster_2_clusters
1625-
tags: [ "e2e_test_suite", "cloudqa"]
1625+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static"]
16261626
run_on:
16271627
- ubuntu2204-large
16281628
<<: *base_om6_dependency
@@ -1631,7 +1631,7 @@ buildvariants:
16311631

16321632
- name: e2e_static_multi_cluster_2_clusters
16331633
display_name: e2e_static_multi_cluster_2_clusters
1634-
tags: [ "e2e_test_suite", "cloudqa"]
1634+
tags: [ "e2e_test_suite", "cloudqa", "static"]
16351635
run_on:
16361636
- ubuntu2204-large
16371637
<<: *base_om6_dependency
@@ -1649,7 +1649,7 @@ buildvariants:
16491649

16501650
- name: e2e_static_multi_cluster_om_appdb
16511651
display_name: e2e_static_multi_cluster_om_appdb
1652-
tags: [ "e2e_test_suite" ]
1652+
tags: [ "e2e_test_suite", "static" ]
16531653
run_on:
16541654
- ubuntu2204-large
16551655
<<: *base_om6_dependency
@@ -1669,7 +1669,7 @@ buildvariants:
16691669

16701670
- name: e2e_operator_kind_ubi_cloudqa
16711671
display_name: e2e_operator_kind_ubi_cloudqa
1672-
tags: [ "e2e_test_suite", "cloudqa" ]
1672+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
16731673
run_on:
16741674
- ubuntu2204-large
16751675
<<: *base_no_om_image_dependency
@@ -1678,7 +1678,7 @@ buildvariants:
16781678

16791679
- name: e2e_static_operator_kind_ubi_cloudqa
16801680
display_name: e2e_static_operator_kind_ubi_cloudqa
1681-
tags: [ "e2e_test_suite", "cloudqa" ]
1681+
tags: [ "e2e_test_suite", "cloudqa", "static" ]
16821682
run_on:
16831683
- ubuntu2204-large
16841684
<<: *base_no_om_image_dependency
@@ -1687,7 +1687,7 @@ buildvariants:
16871687

16881688
- name: e2e_operator_no_webhook_roles_cloudqa
16891689
display_name: e2e_operator_no_webhook_roles_cloudqa
1690-
tags: [ "e2e_test_suite", "cloudqa" ]
1690+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
16911691
run_on:
16921692
- ubuntu2204-large
16931693
<<: *base_no_om_image_dependency
@@ -1721,7 +1721,7 @@ buildvariants:
17211721

17221722
- name: e2e_static_kind_olm_ubi
17231723
display_name: e2e_static_kind_olm_ubi
1724-
tags: [ "e2e_test_suite" ]
1724+
tags: [ "e2e_test_suite", "static" ]
17251725
run_on:
17261726
- ubuntu2204-large
17271727
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)