copy-wheels: fix index build

wheel-copy.sh is the wrong place to do the index of the package
directory.  Move it to wheel-index.sh where we are walking the final
wheel directories.

Change-Id: I58329650962b4dbe24f79a1f4e4ea54e709233c1
This commit is contained in:
Ian Wienand 2020-01-15 18:06:39 +11:00
parent 447d64a68a
commit f767e5230a
3 changed files with 7 additions and 5 deletions

View File

@ -22,10 +22,6 @@ for f in $WHEELHOUSE_DIR/*; do
DEST_DIR="${PACKAGENAME:0:1}/$PACKAGENAME" DEST_DIR="${PACKAGENAME:0:1}/$PACKAGENAME"
# Create the index file
# NOTE(ianw) : remove temporary "--output" when working
/usr/local/bin/wheel-indexer.py --debug --output "index.html.tmp" $f
# Create the mirror directories in AFS /s/split style. This # Create the mirror directories in AFS /s/split style. This
# depends on the existence of a mod_rewrite script which unmunges # depends on the existence of a mod_rewrite script which unmunges
# the path, and is required because AFS has a practical folder size # the path, and is required because AFS has a practical folder size

View File

@ -20,6 +20,11 @@ REGEX="([^/])\/(\1[^/]+)$"
for f in $FILES; do for f in $FILES; do
if [[ $f =~ $REGEX ]]; then if [[ $f =~ $REGEX ]]; then
echo " <li><a href=\"./${BASH_REMATCH[2]}/\">${BASH_REMATCH[2]}</a></li>" >> $TMP_INDEX_FILE echo " <li><a href=\"./${BASH_REMATCH[2]}/\">${BASH_REMATCH[2]}</a></li>" >> $TMP_INDEX_FILE
# Run the indexer over this directory
# NOTE(ianw) : remove temporary "--output" when working
/usr/local/bin/wheel-indexer.py --debug --output "index.html.tmp" $MIRROR_ROOT/$f
fi fi
done done

View File

@ -14,6 +14,7 @@
group: root group: root
mode: '0755' mode: '0755'
loop: loop:
- wheel-index.sh
- wheel-copy.sh - wheel-copy.sh
- wheel-indexer.py - wheel-indexer.py
become: yes become: yes
@ -22,7 +23,7 @@
command: '/usr/local/bin/wheel-copy.sh {{ wheel_dir }} {{ afs_dir }}' command: '/usr/local/bin/wheel-copy.sh {{ wheel_dir }} {{ afs_dir }}'
- name: Rebuild top-level mirror index - name: Rebuild top-level mirror index
script: wheel-index.sh {{ afs_dir }} command: '/usr/local/bin/wheel-index.sh {{ afs_dir }}'
# With multiple python2/3 builds, we only need one host to generate # With multiple python2/3 builds, we only need one host to generate
# the final index. All hosts should be finished copying under # the final index. All hosts should be finished copying under
# linear strategy. # linear strategy.