Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.remove "dirty" field 2.correct get_current_bios uri #225

Open
wants to merge 1 commit into
base: 201811_cel_dev_for_openbmc
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ def get_current_bios(self):
# @return a string, "master" or "slave"
"""
bios_ver = "N/A"
data = self.get_from_bmc(self.bmc_info_uri)
data = self.get_from_bmc(self.bios_boot_uri)
if not data or "Flash" not in data:
return bios_ver

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ def get_current_bios(self):
# @return a string, "master" or "slave"
"""
bios_ver = "N/A"
data = self.get_from_bmc(self.bmc_info_uri)
data = self.get_from_bmc(self.bios_boot_uri)
if not data or "Flash" not in data:
return bios_ver

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ def get_current_bios(self):
# @return a string, "master" or "slave"
"""
bios_ver = "N/A"
data = self.get_from_bmc(self.bmc_info_uri)
data = self.get_from_bmc(self.bios_boot_uri)
if not data or "Flash" not in data:
return bios_ver

Expand Down
2 changes: 1 addition & 1 deletion functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sonic_get_version() {
local latest_tag=$(git describe --tags --abbrev=0)
local branch_name=$(git rev-parse --abbrev-ref HEAD)
if [ -n "$(git status --untracked-files=no -s --ignore-submodules)" ]; then
local dirty="-dirty-$BUILD_TIMESTAMP"
local dirty="-$BUILD_TIMESTAMP"
fi
BUILD_NUMBER=${BUILD_NUMBER:-0}
## Check if we are on tagged commit
Expand Down