Skip to content

Commit faf9d7f

Browse files
authored
Merge pull request #1321 from stackhpc/2024.1-2023.1-merge
2024.1: 2023.1 merge
2 parents 8645685 + 34c624c commit faf9d7f

File tree

5 files changed

+67
-2
lines changed

5 files changed

+67
-2
lines changed

.github/workflows/stackhpc-all-in-one.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- name: Install Package
8989
uses: ConorMacBride/install-package@main
9090
with:
91-
apt: git unzip nodejs
91+
apt: git unzip nodejs openssh-client
9292

9393
# If testing upgrade, checkout previous release, otherwise checkout current branch
9494
- name: Checkout ${{ inputs.upgrade && 'previous release' || 'current' }} config

.github/workflows/stackhpc-build-kayobe-image.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,25 @@ jobs:
9898
push: true
9999
tags: ${{ steps.meta.outputs.tags }}
100100
labels: ${{ steps.meta.outputs.labels }}
101+
102+
- name: Send message to Slack via Workflow Builder
103+
uses: slackapi/[email protected]
104+
with:
105+
payload: |
106+
{
107+
"channel-id": "${{ env.SLACK_CHANNEL_ID }}",
108+
"inputs": "${{ env.INPUTS }}",
109+
"message": "${{ env.MESSAGE }}",
110+
"results-url": "${{ env.RESULTS_URL }}",
111+
"workflow-url": "${{ env.WORKFLOW_URL }}"
112+
}
113+
env:
114+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
115+
# #release-train-alerts
116+
SLACK_CHANNEL_ID: C03B28HRP53
117+
INPUTS: >-
118+
branch: ${{ github.ref_name }}
119+
MESSAGE: "SKC Build Kayobe Image workflow failed :sob:"
120+
RESULTS_URL: "N/A"
121+
WORKFLOW_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
122+
if: failure() && github.event_name == 'push'

.github/workflows/stackhpc-ci-cleanup.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,24 @@ jobs:
7575
OS_CLOUD: openstack
7676
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
7777
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
78+
79+
- name: Send message to Slack via Workflow Builder
80+
uses: slackapi/[email protected]
81+
with:
82+
payload: |
83+
{
84+
"channel-id": "${{ env.SLACK_CHANNEL_ID }}",
85+
"inputs": "${{ env.INPUTS }}",
86+
"message": "${{ env.MESSAGE }}",
87+
"results-url": "${{ env.RESULTS_URL }}",
88+
"workflow-url": "${{ env.WORKFLOW_URL }}"
89+
}
90+
env:
91+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
92+
# #release-train-alerts
93+
SLACK_CHANNEL_ID: C03B28HRP53
94+
INPUTS: "N/A"
95+
MESSAGE: "SKC CI Cleanup workflow failed :sob:"
96+
RESULTS_URL: "N/A"
97+
WORKFLOW_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
98+
if: failure()

.github/workflows/stackhpc-promote.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,25 @@ jobs:
4343
- name: Display link to container image promotion workflows
4444
run: |
4545
echo "::notice Container image promote workflow: https://github.com/stackhpc/stackhpc-release-train/actions/workflows/container-promote.yml"
46+
47+
- name: Send message to Slack via Workflow Builder
48+
uses: slackapi/[email protected]
49+
with:
50+
payload: |
51+
{
52+
"channel-id": "${{ env.SLACK_CHANNEL_ID }}",
53+
"inputs": "${{ env.INPUTS }}",
54+
"message": "${{ env.MESSAGE }}",
55+
"results-url": "${{ env.RESULTS_URL }}",
56+
"workflow-url": "${{ env.WORKFLOW_URL }}"
57+
}
58+
env:
59+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
60+
# #release-train-alerts
61+
SLACK_CHANNEL_ID: C03B28HRP53
62+
INPUTS: >-
63+
branch: ${{ github.ref_name }}
64+
MESSAGE: "SKC promote workflow failed :sob:"
65+
RESULTS_URL: "N/A"
66+
WORKFLOW_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
67+
if: failure()

etc/kayobe/environments/ci-multinode/seed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ snat_rules: "{{ snat_rules_default + snat_rules_manila if (kolla_enable_manila |
3232
# seed node firewalld configuration.
3333

3434
# Whether to install and enable firewalld.
35-
seed_firewalld_enabled: true
35+
seed_firewalld_enabled: "{{ kolla_enable_ovn | bool }}"
3636

3737
# A list of zones to create. Each item is a dict containing a 'zone' item.
3838
seed_firewalld_zones: "{{ stackhpc_firewalld_zones }}"

0 commit comments

Comments
 (0)