Skip to content

Commit fba1071

Browse files
committed
Merge branches 'w/132.0/improvement/ARTESCA-16630-bump-module-federation-0.21.6' and 'development/133.0' into tmp/octopus/w/133.0/improvement/ARTESCA-16630-bump-module-federation-0.21.6
3 parents 45d8a4b + c6fa268 + 4c6ed05 commit fba1071

File tree

9 files changed

+105
-26
lines changed

9 files changed

+105
-26
lines changed

.github/workflows/crons.yaml

Lines changed: 83 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,42 @@ on:
44
# NOTE: Schedule is only run on the latest commit of the default branch,
55
# so we need to schedule Cron Jobs for all branches here
66
schedule:
7+
# Daily builds, scheduled before nightlies every weekday at 22:00
8+
- cron: "0 22 * * 1-5"
9+
710
# Run V 0 nightly every weekday at 01:00
811
- cron: "0 1 * * 1-5"
912

1013
# Run V -1 nightly every weekday at 02:00
1114
- cron: "0 2 * * 1-5"
1215

16+
# Retry failed nightlies every weekday at 06:00 (4 hours after last nightly)
17+
- cron: "0 6 * * 1-5"
18+
1319
jobs:
1420
crons:
1521
runs-on: ubuntu-24.04
22+
env:
23+
MAX_RETRIES: '2'
1624
strategy:
1725
fail-fast: false
1826
matrix:
1927
include:
28+
# Daily build jobs, needed to make sure we have at least one build
29+
# on latests commits of each branch. It is especially needed because
30+
# artifacts from builds expire after 2 weeks and nightly builds fail
31+
# current=132.0
32+
- name: "Build for MetalK8s 132.0"
33+
cron: "0 22 * * 1-5"
34+
branch: "development/132.0"
35+
workflow: "build.yaml"
36+
# old=131.0
37+
- name: "Build for MetalK8s 131.0"
38+
cron: "0 22 * * 1-5"
39+
branch: "development/131.0"
40+
workflow: "build.yaml"
41+
42+
# Nightly jobs
2043
# these helper comments are needed by the dev branch workflow
2144
# please do not edit them unless you're changing the version as well
2245
# current=133.0
@@ -29,12 +52,68 @@ jobs:
2952
cron: "0 2 * * 1-5"
3053
branch: "development/132.0"
3154
workflow: "nightly.yaml"
55+
56+
# Nightly retry jobs
57+
# current=132.0
58+
- name: "Retry Nightly for MetalK8s 132.0"
59+
cron: "0 6 * * 1-5"
60+
branch: "development/132.0"
61+
workflow: "nightly.yaml"
62+
type: "retry"
63+
# old=131.0
64+
- name: "Retry Nightly for MetalK8s 131.0"
65+
cron: "0 6 * * 1-5"
66+
branch: "development/131.0"
67+
workflow: "nightly.yaml"
68+
type: "retry"
3269
steps:
3370
- name: Checkout
3471
if: github.event.schedule == matrix.cron
3572
uses: actions/checkout@v6
36-
- name: Run ${{ matrix.name }}
37-
if: github.event.schedule == matrix.cron
73+
- name: "Smart trigger for ${{ matrix.name }}"
74+
if: github.event.schedule == matrix.cron && matrix.type != 'retry'
75+
uses: scality/actions/actions-nightly-trigger@1.17.0
76+
with:
77+
branch: ${{ matrix.branch }}
78+
workflow: ${{ matrix.workflow }}
79+
access_token: ${{ secrets.GIT_ACCESS_TOKEN }}
80+
- name: "Retry workflow for ${{ matrix.name }}"
81+
id: retry
82+
if: github.event.schedule == matrix.cron && matrix.type == 'retry'
83+
uses: scality/actions/action-retry-workflow@1.17.0
84+
with:
85+
branch: ${{ matrix.branch }}
86+
workflow: ${{ matrix.workflow }}
87+
step-name: 'Spawn cluster with Terraform'
88+
max-retries: ${{ env.MAX_RETRIES }}
89+
retry-mode: 'failed-only'
90+
access_token: ${{ secrets.GITHUB_TOKEN }}
91+
- name: Notify Slack on retry triggered
92+
if: matrix.type == 'retry' && steps.retry.outputs.was-retried == 'true'
93+
uses: slackapi/slack-github-action@v1
94+
with:
95+
channel-id: '#squad-metalk8s'
96+
slack-message: |
97+
Nightly retry triggered for ${{ matrix.branch }}
98+
Job: ${{ matrix.name }}
99+
Status: ${{ steps.retry.outputs.status }}
100+
Retries performed: ${{ steps.retry.outputs.retry-count }}
101+
Retried run: https://github.com/${{ github.repository }}/actions/runs/${{ steps.retry.outputs.run-id }}
102+
Cron run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
103+
env:
104+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
105+
- name: Notify Slack on manual action needed
106+
if: matrix.type == 'retry' && steps.retry.outputs.retry-count != '' && fromJSON(steps.retry.outputs.retry-count) >= fromJSON(env.MAX_RETRIES)
107+
uses: slackapi/slack-github-action@v1
108+
with:
109+
channel-id: '#squad-metalk8s'
110+
slack-message: |
111+
⚠️ MANUAL ACTION REQUIRED ⚠️
112+
Nightly for ${{ matrix.branch }} failed after ${{ steps.retry.outputs.retry-count }} retry attempts
113+
Job: ${{ matrix.name }}
114+
Max retries (${{ env.MAX_RETRIES }}) exhausted - manual intervention needed
115+
Workflow: ${{ matrix.workflow }}
116+
Failed run: https://github.com/${{ github.repository }}/actions/runs/${{ steps.retry.outputs.run-id }}
117+
Cron run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
38118
env:
39-
GITHUB_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }}
40-
run: gh workflow run ${{ matrix.workflow }} --ref=${{ matrix.branch }}
119+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@
1616
net.bridge.bridge-nf-call-iptables sysctls
1717
(PR[#4724](https://github.com/scality/metalk8s/pull/4724))
1818

19-
## Release 131.0.6 (in development)
19+
## Release 131.0.9 (in development)
20+
21+
## Release 131.0.8
22+
23+
## Release 131.0.7
24+
25+
## Release 131.0.6
2026

2127
### Bug Fixes
2228

buildchain/buildchain/versions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def load_version_information() -> None:
8686
NODEJS_IMAGE_VERSION: str = "20.11.1"
8787
KEEPALIVED_VERSION: str = "2.3.3"
8888
CERT_MANAGER_VERSION: str = "1.17.1"
89-
UI_OPERATOR_VERSION: str = "1.0.12"
89+
UI_OPERATOR_VERSION: str = "1.0.13"
9090

9191
# Current build IDs, to be augmented whenever we rebuild the corresponding
9292
# image, e.g. because the `Dockerfile` is changed, or one of the dependencies
@@ -270,7 +270,7 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
270270
Image(
271271
name="ui-operator",
272272
version=UI_OPERATOR_VERSION,
273-
digest="sha256:6e415d8598416f3b1878c83a9617e650d32a7f610fa7eded7e7b96dab9ea63f6",
273+
digest="sha256:ea2e74f3642105872d0f27b5e19650c58af20e99762fa0d354e185547e0aaea4",
274274
),
275275
Image(
276276
name="loki",

shell-ui/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shell-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"ts-node": "^10.9.2"
4646
},
4747
"dependencies": {
48-
"@scality/core-ui": "0.187.0",
4948
"@scality/module-federation": "^1.5.0",
49+
"@scality/core-ui": "0.193.0",
5050
"downshift": "^8.0.0",
5151
"history": "^5.3.0",
5252
"jest-environment-jsdom": "^29.7.0",

shell-ui/rspack.config.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,6 @@ const config: Configuration = {
122122
...Object.fromEntries(
123123
Object.entries(deps).map(([key, version]) => [key, {}]),
124124
),
125-
'@scality/core-ui': {
126-
singleton: true,
127-
},
128125
'react-intl': {
129126
eager: true,
130127
singleton: true,

ui/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"@hookform/resolvers": "^3.1.0",
88
"@js-temporal/polyfill": "^0.4.4",
99
"@kubernetes/client-node": "github:scality/kubernetes-client-javascript.git#browser-0.10.4-64-ge7c6721",
10-
"@scality/core-ui": "0.187.0",
1110
"@scality/module-federation": "^1.5.0",
11+
"@scality/core-ui": "0.193.0",
1212
"axios": "^0.21.1",
1313
"formik": "2.2.5",
1414
"jsonpath": "^1.1.1",

ui/rspack.config.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@ const config: Configuration = {
132132
...Object.fromEntries(
133133
Object.entries(deps).map(([key, version]) => [key, {}]),
134134
),
135-
'@scality/core-ui': {
136-
singleton: true,
137-
},
138135
'@scality/module-federation': {
139136
singleton: true,
140137
},

0 commit comments

Comments
 (0)