Skip to content

Commit

Permalink
Restore metal3-dev-env file (openshift-metal3#1577)
Browse files Browse the repository at this point in the history
I'm finding after the change openshift-metal3#1573
to workaround the upgrade issue that running 'make clean; make agent' fails with
the error:
+(utils.sh:294): sync_repo_and_patch(): git checkout main
Already on 'main'
M	vm-setup/roles/packages_installation/tasks/centos_required_packages.yml
Your branch is behind 'origin/main' by 454 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

This PR restores the file.
  • Loading branch information
bfournie authored Sep 8, 2023
1 parent 5cf44c2 commit 0d9f0ce
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ocp_cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,6 @@ fi
# Cleanup chrony configuration
sudo sed -ie '/^allow /d' /etc/chrony.conf

# Restore file after workaround
cd ${METAL3_DEV_ENV_PATH}
git checkout vm-setup/roles/packages_installation/tasks/centos_required_packages.yml

0 comments on commit 0d9f0ce

Please sign in to comment.