Skip to content

Commit a9032df

Browse files
committed
fix: wpb-21356 remove static build hashes and enabled bundle build verification in offline.yml workflow
1 parent 4d3fdb0 commit a9032df

3 files changed

Lines changed: 4 additions & 12 deletions

File tree

.github/workflows/offline.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
- "**/*.md"
2525
pull_request:
2626
types: [synchronize, reopened, labeled]
27-
branches: [mwpb-21356*]
27+
branches: [wpb-21356*]
2828
paths-ignore:
2929
- "*.md"
3030
- "**/*.md"
@@ -75,10 +75,8 @@ jobs:
7575

7676
verify-default:
7777
name: Verify default profile
78-
# uncomment me
79-
# needs: build-default
78+
needs: build-default
8079
if: |
81-
github.event_name == 'push' ||
8280
contains(github.event.pull_request.labels.*.name, 'build-all') ||
8381
contains(github.event.pull_request.labels.*.name, 'build-default')
8482
runs-on:
@@ -116,10 +114,8 @@ jobs:
116114
# verify wiab-staging profile
117115
verify-wiab-staging:
118116
name: Verify wiab staging profile
119-
# uncomment me
120-
# needs: build-default
117+
needs: build-default
121118
if: |
122-
github.event_name == 'push' ||
123119
contains(github.event.pull_request.labels.*.name, 'build-all') ||
124120
contains(github.event.pull_request.labels.*.name, 'build-wiab-staging')
125121
runs-on:

offline/cd.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ ARTIFACTS_DIR="${CD_DIR}/default-build/output"
88
VALUES_DIR="${CD_DIR}/../values"
99

1010
COMMIT_HASH="${GITHUB_SHA}"
11-
#remove me
12-
COMMIT_HASH="59e6acf2e58e15d96f7de60b88df753e9b667007"
1311
ARTIFACT="wire-server-deploy-static-${COMMIT_HASH}"
1412

1513
# Retry configuration
@@ -127,7 +125,7 @@ scp -oStrictHostKeyChecking=accept-new -o ConnectionAttempts=10 "$VALUES_DIR/ing
127125
scp -oStrictHostKeyChecking=accept-new -o ConnectionAttempts=10 inventory.yml "root@$adminhost":./ansible/inventory/offline/inventory.yml
128126

129127
ssh "root@$adminhost" cat ./ansible/inventory/offline/inventory.yml || true
130-
128+
ls -ls ssh_private_key || true
131129
echo "Running ansible playbook setup_nodes.yml via adminhost ($adminhost)..."
132130
ansible-playbook -i inventory.yml setup_nodes.yml --private-key "ssh_private_key" \
133131
-e "ansible_ssh_common_args='-o ProxyCommand=\"ssh -W %h:%p -q root@$adminhost -i ssh_private_key\" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'"

offline/cd_staging.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ ARTIFACTS_DIR="${CD_DIR}/default-build/output"
88
VALUES_DIR="${CD_DIR}/../values"
99

1010
COMMIT_HASH="${GITHUB_SHA}"
11-
#remove me
12-
COMMIT_HASH="59e6acf2e58e15d96f7de60b88df753e9b667007"
1311
ARTIFACT="wire-server-deploy-static-${COMMIT_HASH}"
1412

1513
# Retry configuration

0 commit comments

Comments
 (0)