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.

Sign up for GitHub

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

Jump to bottom

HADOOP-16820. [thirdparty] ChangeLog and ReleaseNote are not packaged by createrelease script #2

Merged
merged 1 commit into from
Jan 22, 2020
Merged

HADOOP-16820. [thirdparty] ChangeLog and ReleaseNote are not packaged by createrelease script #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev-support/bin/create-release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,12 +551,12 @@ function makearelease

# Stage CHANGELOG and RELEASENOTES files
for i in CHANGELOG RELEASENOTES; do
if [[ $(ls -l "${BASEDIR}/src/site/markdown/release/${HADOOP_THIRDPARTY_VERSION}"/${i}*.md | wc -l) == 0 ]]; then
if [[ $(ls -l "${BASEDIR}/src/site/markdown/release/thirdparty-${HADOOP_THIRDPARTY_VERSION}"/${i}*.md | wc -l) == 0 ]]; then
echo "No ${i} found. Continuing..."
continue;
fi
run cp -p \
"${BASEDIR}/src/site/markdown/release/${HADOOP_THIRDPARTY_VERSION}"/${i}*.md \
"${BASEDIR}/src/site/markdown/release/thirdparty-${HADOOP_THIRDPARTY_VERSION}"/${i}*.md \
"${ARTIFACTS_DIR}/${i}.md"
done

Expand Down
9 changes: 9 additions & 0 deletions dev-support/bin/yetus-wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,15 @@ if ! (gunzip -c "${TARBALL}.gz" | tar xpf -); then
exit 1
fi

if [[ "${WANTED}" == "releasedocmaker" ]]; then
# releasedocmaker expects versions to be in form of x.y.z to generate index and readme files.
# But thirdparty version will be in form of 'thirdparty-x.y.z'
if [[ -x "${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/lib/releasedocmaker/releasedocmaker/__init__.py" ]]; then
sed -i 's@glob(\"@glob(\"thirdparty-@g' "${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/lib/releasedocmaker/releasedocmaker/__init__.py"
sed -i 's@%s v%s@%s %s@g' "${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/lib/releasedocmaker/releasedocmaker/__init__.py"
fi
fi

if [[ -x "${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/bin/${WANTED}" ]]; then
popd >/dev/null
exec "${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/bin/${WANTED}" "${ARGV[@]}"
Expand Down