openstack/project-config
Code Issues Proposed changes

Merge "use a temporary file to hold the release change list"

Browse Source
This commit is contained in:
Zuul
2017-10-24 17:38:18 +00:00
committed by Gerrit Code Review
parent 3614b838c4 9b11c20e11
commit 0ef11c16d3
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jenkins/scripts/release-tools/branch_from_yaml.sh
View File

@@ -41,13 +41,27 @@ RELEASES_REPO="$1"
shift
DELIVERABLES="$@"
setup_temp_space
echo "Current state of $RELEASES_REPO"
(cd $RELEASES_REPO && git show)
echo "Changed files in the latest commit"
# This is the command list_deliverable_branches.py uses to figure out
# what files have been touched.
(cd $RELEASES_REPO && git diff --name-only --pretty=format: HEAD^)
change_list_file=$MYTMPDIR/change_list.txt
echo "Discovered deliverable updates"
$TOOLSDIR/list_deliverable_branches.py -r $RELEASES_REPO $DELIVERABLES | tee $change_list_file
RC=0
$TOOLSDIR/list_deliverable_branches.py -r $RELEASES_REPO $DELIVERABLES \
| while read repo branch ref; do
while read repo branch ref; do
echo "$repo $branch $ref"
$TOOLSDIR/make_branch.sh $repo $branch $ref
RC=$(($RC + $?))
done
done < $change_list_file
exit $RC

10
jenkins/scripts/release-tools/release_from_yaml.sh
View File

@@ -68,6 +68,8 @@ RELEASES_REPO="$1"
shift
DELIVERABLES="$@"
setup_temp_space
# Configure git to pull the notes where gerrit stores review history
# like who approved a patch.
cd $RELEASES_REPO
@@ -99,16 +101,16 @@ echo "Changed files in the latest commit"
# what files have been touched.
(cd $RELEASES_REPO && git diff --name-only --pretty=format: HEAD^)
change_list_file=$MYTMPDIR/change_list.txt
echo "Discovered deliverable updates"
$TOOLSDIR/list_deliverable_changes.py -r $RELEASES_REPO $DELIVERABLES
$TOOLSDIR/list_deliverable_changes.py -r $RELEASES_REPO $DELIVERABLES | tee $change_list_file
echo "Starting tagging"
$TOOLSDIR/list_deliverable_changes.py -r $RELEASES_REPO $DELIVERABLES \
| while read deliverable series version diff_start repo hash pypi first_full; do
while read deliverable series version diff_start repo hash pypi first_full; do
echo "$deliverable $series $version $diff_start $repo $hash $pypi $first_full"
$TOOLSDIR/release.sh $repo $series $version $diff_start $hash $pypi $first_full "$RELEASE_META"
RC=$(($RC + $?))
done
done < $change_list_file
exit $RC