Skip to content
This repository has been archived by the owner on Jul 25, 2022. It is now read-only.

Commit

Permalink
Update package naming (#161)
Browse files Browse the repository at this point in the history
* Update package naming

Fixes #158.

Update the package naming from ee -> iml. In addition, bump the version to 4.0.0.
  • Loading branch information
Joe Grund committed Jul 19, 2017
1 parent 0b6785b commit 1d3c519
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ artifacts
tags
chroma-bundles/*/repo
chroma-bundles/*/*.tar.gz
chroma-bundles/ee-*.tar.gz
chroma-bundles/iml-*.tar.gz
chroma-bundles/EULA.txt
chroma-bundles/lesskey.out
chroma-bundles/ieel-*.tar.gz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ def reset_chroma_manager_db(self):

result = self.remote_command(
chroma_manager['address'],
"ls /tmp/ee-*/",
"ls /tmp/iml-*/",
expected_return_code = None
)
installer_contents = result.stdout
Expand All @@ -699,7 +699,7 @@ def reset_chroma_manager_db(self):
logger.debug("Found these profiles: %s" % profiles)
result = self.remote_command(
chroma_manager['address'],
"for profile_pat in %s; do chroma-config profile register /tmp/ee-*/$profile_pat; done &> config_profile.log" % profiles,
"for profile_pat in %s; do chroma-config profile register /tmp/iml-*/$profile_pat; done &> config_profile.log" % profiles,
expected_return_code = None
)
chroma_config_exit_status = result.exit_status
Expand Down
6 changes: 3 additions & 3 deletions include/Makefile.version
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ space +=
SCM_COMMIT_NUMBER := $(shell git rev-list HEAD | wc -l)
BUILD_TAG ?= non-jenkins-build
JENKINS_BUILD_TAG := $(shell echo jenkins-$(JOB_NAME)-$(BUILD_NUMBER) | sed -e 's/arch=[^,-]*,\?-\?//' -e 's/distro=[^,-]*,\?-\?//' -e 's,[/-],_,g')
SCM_DESCRIPTION := $(shell msg=$$(git log -n 1 --abbrev-commit); if echo "$$msg" | grep -q "^ Create-Tag:"; then echo "$$msg" | sed -ne '/^ Create-Tag:/s/RC[0-9]*//;s/^.*: *v//p'; fi)
SCM_DESCRIPTION := $(shell msg=$$(git log -n 1 --abbrev-commit); if echo "$$msg" | grep -q "^ Create-Tag:"; then echo "$$msg" | sed -ne '/^ Create-Tag:/s/RC[0-9]*//;s/^.*: *v//p';/^ Create-Tag:/s/P[0-9]*//; fi)
ifeq ($(strip $(SCM_DESCRIPTION)),)
SCM_DESCRIPTION := $(subst -,$(space),$(shell git describe --match v[0-9]* | sed -e 's/^v//' -e 's/RC[0-9]*//'))
SCM_DESCRIPTION := $(subst -,$(space),$(shell git describe --match v[0-9]* | sed -e 's/^v//' -e 's/RC[0-9]*//' -e 's/P[0-9]*//'))
endif
ARCHIVE_NAME := Intel Enterprise Edition for Lustre Software
SHORT_ARCHIVE_NAME := ee
SHORT_ARCHIVE_NAME := iml
ARCHIVE_VERSION := $(word 1, $(SCM_DESCRIPTION))
PRODUCT_NAME := Intel Manager for Lustre
SHORT_PRODUCT_NAME := iml
Expand Down

0 comments on commit 1d3c519

Please sign in to comment.