Skip to content

Commit f7f8585

Browse files
committed
Fix stashing step of AIO upgrade
No need to restore kolla/globals.yml anymore.
1 parent e3611e5 commit f7f8585

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,8 @@ jobs:
396396

397397
# If testing upgrade, checkout the current release branch
398398
# Stash changes to tracked files, and set clean=false to avoid removing untracked files.
399-
# Revert changes to RabbitMQ Queue types to avoid a merge conflict
400399
- name: Stash config changes
401-
run: git restore etc/kayobe/environments/ci-aio/kolla/globals.yml && git stash
400+
run: git stash
402401
if: inputs.upgrade
403402

404403
- name: Checkout current release config

0 commit comments

Comments
 (0)