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

Fixes package name problem and locale problem #959

Merged
merged 7 commits into from
Aug 11, 2022

Conversation

gurkanindibay
Copy link
Contributor

@gurkanindibay gurkanindibay commented Aug 10, 2022

Currently, naming strucuture for rpm is as below
citus_13-11.1.0.citus-0.0.git.20220731.5490c85.el7.x86_64.rpm

When you try to install the package as instructed in citusdata download page, it doesn't work since package name does not include version just after citus as below
citus110_13-11.0.5.citus-1.el7.x86_64.rpm

With the new development, package name will be like below
citus110_13-11.1.0.citus-0.0.git.20220731.5490c85.el7.x86_64.rpm

Additionally I found a bug for centos 7 packages related to locale set. Since C.utf8 is not among supported locales for centos 7, the error below appears in the logs
"sh: warning: setlocale: LC_ALL: cannot change locale (C.utf8): No such file or directory"
When I check the commit history, I found out that the intention to add C.utf8 for Centos is just for el/8 , Not for el/7
Commit hash for this change: e864e96

@gurkanindibay gurkanindibay requested review from hanefi and onurctirtir and removed request for onurctirtir August 11, 2022 09:18
Copy link
Member

@hanefi hanefi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overall. Will need to verify that the naming is still as expected after the comments are addressed.

if [ "${osname}" == 'Oracle' ]; then
locale='C'
elif [ "${osname}" == 'Fedora' ] || [ "${osname}" == 'CentOS' ]; then
elif [ "${osname}" == 'Fedora' ] || [[ "${osname}" == 'CentOS' && "${os_release}" == 8* ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it is time that we remove all references to Fedora in our scripts. This hurts readability, and there are a lot of leftover code that do not really have any value.

Can we create an issue and track this please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment on lines 202 to 203
LC_ALL=${locale}
rpmdev-bumpspec -c "${msg}" "${builddir}/${pkgname}.spec"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these two statements are meant to be on the same line.

Suggested change
LC_ALL=${locale}
rpmdev-bumpspec -c "${msg}" "${builddir}/${pkgname}.spec"
LC_ALL=${locale} rpmdev-bumpspec -c "${msg}" "${builddir}/${pkgname}.spec"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right fixed as you suggested

Comment on lines 210 to 211
LC_ALL=${locale}
rpmdev-bumpspec -c "${msg}" "${builddir}/${pkgname}.spec"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these two statements are meant to be on the same line.

Suggested change
LC_ALL=${locale}
rpmdev-bumpspec -c "${msg}" "${builddir}/${pkgname}.spec"
LC_ALL=${locale} rpmdev-bumpspec -c "${msg}" "${builddir}/${pkgname}.spec"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right fixed as you suggested

scripts/fetch_and_build_rpm Show resolved Hide resolved
@hanefi
Copy link
Member

hanefi commented Aug 11, 2022

Can we also trigger some nightly and regular image builds so that we can see everything works as expected?

@gurkanindibay
Copy link
Contributor Author

Can we also trigger some nightly and regular image builds so that we can see everything works as expected?

Images should be created after merge of the PR to be able to see nightlies with the new images
I performed local test

@gurkanindibay
Copy link
Contributor Author

Can we also trigger some nightly and regular image builds so that we can see everything works as expected?

Images should be created after merge of the PR to be able to see nightlies with the new images I performed local test

image

Copy link
Member

@hanefi hanefi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good after we update a stale comment

fi
sed -i -E "1i %global pkginfix ${package_prefix}" "${builddir}/${pkgname}.spec"
fi

case "${1}" in
release)
# add minor/major version to package name if using fancy versioning
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment no longer makes sense. Can we update that with a simple explanation on why we do not have any steps for release?

@gurkanindibay gurkanindibay merged commit ae0660e into develop Aug 11, 2022
@gurkanindibay gurkanindibay deleted the rename-nightly-packages branch August 11, 2022 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants