diff options
| -rwxr-xr-x | tools/gate_run.sh | 2 | ||||
| -rwxr-xr-x | tools/publisher.sh | 2 | ||||
| -rwxr-xr-x | tools/setup_Debian.sh | 19 | ||||
| -rwxr-xr-x | tools/setup_RedHat.sh | 19 | ||||
| -rwxr-xr-x | tools/setup_gate.sh | 6 |
5 files changed, 43 insertions, 5 deletions
diff --git a/tools/gate_run.sh b/tools/gate_run.sh index ab7ce8624..d863afa9a 100755 --- a/tools/gate_run.sh +++ b/tools/gate_run.sh @@ -85,7 +85,7 @@ function pack_registry { FILENAME=${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.tar.gz sudo docker stop registry - sudo tar -zcf "images/$FILENAME" -C /tmp/kolla_registry . + sudo tar -zcf "images/$FILENAME" -C /opt/kolla_registry . sudo docker start registry sudo chmod 755 -R images } diff --git a/tools/publisher.sh b/tools/publisher.sh index fa06563ae..1798610c9 100755 --- a/tools/publisher.sh +++ b/tools/publisher.sh @@ -3,7 +3,7 @@ export ZUUL_REF=$ZUUL_REF export BRANCH=$(echo "$ZUUL_BRANCH" | cut -d/ -f2) -export TMP_REGISTRY="tmp/" +export TMP_REGISTRY="opt/" export PUBLISHER=1 export SIGNOFF_FILENAME=${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.txt export FILENAME=${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.tar.gz diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index f217d5bc2..b04369052 100755 --- a/tools/setup_Debian.sh +++ b/tools/setup_Debian.sh @@ -18,6 +18,25 @@ function setup_disk { DEV=$(losetup -a | awk -F: '/\/docker/ {print $1}') fi +# Excerpts from https://github.com/openstack-infra/devstack-gate/blob/dc49f9e6eb18e42c6b175e4e146fa8f3b7633279/functions.sh#L306 + if [ -b /dev/xvde ]; then + DEV2='/dev/xvde' + if mount | grep ${DEV2} > /dev/null; then + echo "*** ${DEV2} appears to already be mounted" + echo "*** ${DEV2} unmounting and reformating" + sudo umount ${DEV2} + fi + sudo parted ${DEV2} --script -- mklabel msdos + sync + sudo partprobe + sudo mkfs.ext4 ${DEV2} + sudo mount ${DEV2} /mnt + sudo find /opt/ -mindepth 1 -maxdepth 1 -exec mv {} /mnt/ \; + sudo umount /mnt + sudo mount ${DEV2} /opt + grep -q ${DEV2} /proc/mounts || exit 1 + fi + # Format Disks and setup Docker to use BTRFS sudo parted ${DEV} -s -- mklabel msdos sudo rm -rf /var/lib/docker diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh index 043d4ff26..3a7345b53 100755 --- a/tools/setup_RedHat.sh +++ b/tools/setup_RedHat.sh @@ -18,6 +18,25 @@ function setup_disk { DEV=$(losetup -a | awk -F: '/\/docker/ {print $1}') fi +# Excerpts from https://github.com/openstack-infra/devstack-gate/blob/dc49f9e6eb18e42c6b175e4e146fa8f3b7633279/functions.sh#L306 + if [ -b /dev/xvde ]; then + DEV2='/dev/xvde' + if mount | grep ${DEV2} > /dev/null; then + echo "*** ${DEV2} appears to already be mounted" + echo "*** ${DEV2} unmounting and reformating" + sudo umount ${DEV2} + fi + sudo parted ${DEV2} --script -- mklabel msdos + sync + sudo partprobe + sudo mkfs.ext4 ${DEV2} + sudo mount ${DEV2} /mnt + sudo find /opt/ -mindepth 1 -maxdepth 1 -exec mv {} /mnt/ \; + sudo umount /mnt + sudo mount ${DEV2} /opt + grep -q ${DEV2} /proc/mounts || exit 1 + fi + # Format Disks and setup Docker to use BTRFS sudo parted ${DEV} -s -- mklabel msdos sudo rm -rf /var/lib/docker diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index 458a265eb..aa99c4481 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -180,9 +180,9 @@ function setup_logging { } function setup_registry { - sudo mkdir /tmp/kolla_registry - sudo chmod -R 644 /tmp/kolla_registry - docker run -d -p 4000:5000 --restart=always -v /tmp/kolla_registry/:/var/lib/registry --name registry registry:2 + sudo mkdir /opt/kolla_registry + sudo chmod -R 644 /opt/kolla_registry + docker run -d -p 4000:5000 --restart=always -v /opt/kolla_registry/:/var/lib/registry --name registry registry:2 } setup_logging |
