Skip to content

Commit 2e5a426

Browse files
committed
Merge branch 'master' into search/public-preview
2 parents 81c6f56 + 9102033 commit 2e5a426

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
@@ -1299,7 +1299,7 @@ buildvariants:
12991299
## MongoDB build variants
13001300
- name: e2e_mdb_kind_ubi_cloudqa
13011301
display_name: e2e_mdb_kind_ubi_cloudqa
1302-
tags: [ "e2e_test_suite", "cloudqa" ]
1302+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
13031303
run_on:
13041304
- ubuntu2204-medium
13051305
<<: *base_no_om_image_dependency
@@ -1308,7 +1308,7 @@ buildvariants:
13081308

13091309
- name: e2e_custom_domain_mdb_kind_ubi_cloudqa
13101310
display_name: e2e_custom_domain_mdb_kind_ubi_cloudqa
1311-
tags: [ "e2e_test_suite", "cloudqa" ]
1311+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
13121312
run_on:
13131313
- ubuntu2204-large
13141314
<<: *base_no_om_image_dependency
@@ -1317,7 +1317,7 @@ buildvariants:
13171317

13181318
- name: e2e_static_mdb_kind_ubi_cloudqa
13191319
display_name: e2e_static_mdb_kind_ubi_cloudqa
1320-
tags: [ "e2e_test_suite", "cloudqa" ]
1320+
tags: [ "e2e_test_suite", "cloudqa", "static" ]
13211321
run_on:
13221322
- ubuntu2204-medium
13231323
<<: *base_no_om_image_dependency
@@ -1326,7 +1326,7 @@ buildvariants:
13261326

13271327
- name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
13281328
display_name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
1329-
tags: [ "e2e_test_suite", "cloudqa" ]
1329+
tags: [ "e2e_test_suite", "cloudqa", "static" ]
13301330
run_on:
13311331
- ubuntu2204-large
13321332
depends_on:
@@ -1346,7 +1346,7 @@ buildvariants:
13461346

13471347
- name: e2e_mdb_openshift_ubi_cloudqa
13481348
display_name: e2e_mdb_openshift_ubi_cloudqa
1349-
tags: [ "e2e_openshift_test_suite", "cloudqa" ]
1349+
tags: [ "e2e_openshift_test_suite", "cloudqa", "cloudqa_non_static" ]
13501350
depends_on:
13511351
- name: build_operator_ubi
13521352
variant: init_test_run
@@ -1366,7 +1366,7 @@ buildvariants:
13661366
# in evergreen for all variants matching e2e_static-*, but we do not want to run openshift variants on every pr.
13671367
- name: e2e_openshift_static_mdb_ubi_cloudqa
13681368
display_name: e2e_openshift_static_mdb_ubi_cloudqa
1369-
tags: [ "e2e_openshift_test_suite", "cloudqa" ]
1369+
tags: [ "e2e_openshift_test_suite", "cloudqa", "static" ]
13701370
depends_on:
13711371
- name: build_operator_ubi
13721372
variant: init_test_run
@@ -1397,7 +1397,7 @@ buildvariants:
13971397
# Isolated Ops Manager Tests for 6.0 version
13981398
- name: e2e_static_om60_kind_ubi
13991399
display_name: e2e_static_om60_kind_ubi
1400-
tags: [ "e2e_test_suite" ]
1400+
tags: [ "e2e_test_suite", "static" ]
14011401
run_on:
14021402
- ubuntu2204-medium
14031403
<<: *base_om6_dependency
@@ -1419,7 +1419,7 @@ buildvariants:
14191419

14201420
- name: e2e_static_om70_kind_ubi
14211421
display_name: e2e_static_om70_kind_ubi
1422-
tags: [ "e2e_test_suite" ]
1422+
tags: [ "e2e_test_suite", "static" ]
14231423
run_on:
14241424
- ubuntu2204-medium
14251425
<<: *base_om7_dependency
@@ -1442,7 +1442,7 @@ buildvariants:
14421442

14431443
- name: e2e_static_om80_kind_ubi
14441444
display_name: e2e_static_om80_kind_ubi
1445-
tags: [ "e2e_test_suite" ]
1445+
tags: [ "e2e_test_suite", "static" ]
14461446
run_on:
14471447
- ubuntu2204-medium
14481448
<<: *base_om8_dependency
@@ -1530,7 +1530,7 @@ buildvariants:
15301530

15311531
- name: e2e_static_smoke_arm
15321532
display_name: e2e_smoke_arm
1533-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1533+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15341534
run_on:
15351535
- ubuntu2204-arm64-large
15361536
allowed_requesters: [ "patch", "github_tag" ]
@@ -1540,7 +1540,7 @@ buildvariants:
15401540

15411541
- name: e2e_static_smoke_ibm_z
15421542
display_name: e2e_static_smoke_ibm_z
1543-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1543+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15441544
run_on:
15451545
- rhel9-zseries-small
15461546
- rhel9-zseries-large
@@ -1563,7 +1563,7 @@ buildvariants:
15631563

15641564
- name: e2e_static_smoke_ibm_power
15651565
display_name: e2e_static_smoke_ibm_power
1566-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1566+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15671567
run_on:
15681568
- rhel9-power-small
15691569
- rhel9-power-large
@@ -1586,7 +1586,7 @@ buildvariants:
15861586

15871587
- name: e2e_static_smoke
15881588
display_name: e2e_static_smoke
1589-
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1589+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
15901590
run_on:
15911591
- ubuntu2204-large
15921592
allowed_requesters: [ "patch", "github_tag" ]
@@ -1598,7 +1598,7 @@ buildvariants:
15981598

15991599
- name: e2e_multi_cluster_kind
16001600
display_name: e2e_multi_cluster_kind
1601-
tags: [ "e2e_test_suite", "cloudqa"]
1601+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static"]
16021602
run_on:
16031603
- ubuntu2204-large
16041604
<<: *base_om6_dependency
@@ -1607,7 +1607,7 @@ buildvariants:
16071607

16081608
- name: e2e_static_multi_cluster_kind
16091609
display_name: e2e_static_multi_cluster_kind
1610-
tags: [ "e2e_test_suite", "cloudqa"]
1610+
tags: [ "e2e_test_suite", "cloudqa", "static"]
16111611
run_on:
16121612
- ubuntu2204-large
16131613
<<: *base_om6_dependency
@@ -1616,7 +1616,7 @@ buildvariants:
16161616

16171617
- name: e2e_multi_cluster_2_clusters
16181618
display_name: e2e_multi_cluster_2_clusters
1619-
tags: [ "e2e_test_suite", "cloudqa"]
1619+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static"]
16201620
run_on:
16211621
- ubuntu2204-large
16221622
<<: *base_om6_dependency
@@ -1625,7 +1625,7 @@ buildvariants:
16251625

16261626
- name: e2e_static_multi_cluster_2_clusters
16271627
display_name: e2e_static_multi_cluster_2_clusters
1628-
tags: [ "e2e_test_suite", "cloudqa"]
1628+
tags: [ "e2e_test_suite", "cloudqa", "static"]
16291629
run_on:
16301630
- ubuntu2204-large
16311631
<<: *base_om6_dependency
@@ -1643,7 +1643,7 @@ buildvariants:
16431643

16441644
- name: e2e_static_multi_cluster_om_appdb
16451645
display_name: e2e_static_multi_cluster_om_appdb
1646-
tags: [ "e2e_test_suite" ]
1646+
tags: [ "e2e_test_suite", "static" ]
16471647
run_on:
16481648
- ubuntu2204-large
16491649
<<: *base_om6_dependency
@@ -1663,7 +1663,7 @@ buildvariants:
16631663

16641664
- name: e2e_operator_kind_ubi_cloudqa
16651665
display_name: e2e_operator_kind_ubi_cloudqa
1666-
tags: [ "e2e_test_suite", "cloudqa" ]
1666+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
16671667
run_on:
16681668
- ubuntu2204-large
16691669
<<: *base_no_om_image_dependency
@@ -1672,7 +1672,7 @@ buildvariants:
16721672

16731673
- name: e2e_static_operator_kind_ubi_cloudqa
16741674
display_name: e2e_static_operator_kind_ubi_cloudqa
1675-
tags: [ "e2e_test_suite", "cloudqa" ]
1675+
tags: [ "e2e_test_suite", "cloudqa", "static" ]
16761676
run_on:
16771677
- ubuntu2204-large
16781678
<<: *base_no_om_image_dependency
@@ -1681,7 +1681,7 @@ buildvariants:
16811681

16821682
- name: e2e_operator_no_webhook_roles_cloudqa
16831683
display_name: e2e_operator_no_webhook_roles_cloudqa
1684-
tags: [ "e2e_test_suite", "cloudqa" ]
1684+
tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
16851685
run_on:
16861686
- ubuntu2204-large
16871687
<<: *base_no_om_image_dependency
@@ -1715,7 +1715,7 @@ buildvariants:
17151715

17161716
- name: e2e_static_kind_olm_ubi
17171717
display_name: e2e_static_kind_olm_ubi
1718-
tags: [ "e2e_test_suite" ]
1718+
tags: [ "e2e_test_suite", "static" ]
17191719
run_on:
17201720
- ubuntu2204-large
17211721
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)