diff options
| author | Jim Rollenhagen <jim@jimrollenhagen.com> | 2016-03-29 13:06:45 -0700 |
|---|---|---|
| committer | Jim Rollenhagen <jim@jimrollenhagen.com> | 2016-03-30 11:33:34 +0000 |
| commit | 40d70ea78f76de615589d4649b6b3ee3c7e05ac4 (patch) | |
| tree | 9c08dc1b2a1f4272b91beb2f7ac294f799db786a | |
| parent | 6fa44980d05a2840e1d537d3f312db48ae545800 (diff) | |
| download | ironic-python-agent-40d70ea78f76de615589d4649b6b3ee3c7e05ac4.tar.gz | |
Fix full_trusty_build once and for all
After finally being able to test this locally, I've found that the
'cgroup-lite' package is what we were missing, not lxc.
Additionally, the output is written by root, not the current user, so
use sudo when modifying/writing files in imagebuild/coreos/UPLOAD.
Change-Id: I8cf5ce5bd5345ccea5e8869f2628f8616d0fe758
Closes-Bug: #1559383
(cherry picked from commit 473b6b4661480e0a2e2c363553e48d62c7145272)
| -rwxr-xr-x | imagebuild/coreos/full_trusty_build.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/imagebuild/coreos/full_trusty_build.sh b/imagebuild/coreos/full_trusty_build.sh index 6dd39f36..c61b0f2b 100755 --- a/imagebuild/coreos/full_trusty_build.sh +++ b/imagebuild/coreos/full_trusty_build.sh @@ -8,7 +8,9 @@ BRANCH_PATH=${BRANCH_PATH:-master} if [ -x "/usr/bin/apt-get" ]; then sudo -E apt-get update - sudo -E apt-get install -y docker.io + # apparmor is an undeclared dependency for docker on ubuntu + # https://github.com/docker/docker/issues/9745 + sudo -E apt-get install -y docker.io apparmor cgroup-lite elif [ -x "/usr/bin/yum" ]; then sudo -E yum install -y docker-io gpg else @@ -21,17 +23,17 @@ imagebuild/coreos/build_coreos_image.sh BUILD_DIR=imagebuild/coreos/UPLOAD if [ "$BRANCH_PATH" != "master" ]; then # add the branch name - mv $BUILD_DIR/coreos_production_pxe_image-oem.cpio.gz $BUILD_DIR/coreos_production_pxe_image-oem-$BRANCH_PATH.cpio.gz - mv $BUILD_DIR/coreos_production_pxe.vmlinuz $BUILD_DIR/coreos_production_pxe-$BRANCH_PATH.vmlinuz + sudo mv $BUILD_DIR/coreos_production_pxe_image-oem.cpio.gz $BUILD_DIR/coreos_production_pxe_image-oem-$BRANCH_PATH.cpio.gz + sudo mv $BUILD_DIR/coreos_production_pxe.vmlinuz $BUILD_DIR/coreos_production_pxe-$BRANCH_PATH.vmlinuz else # in the past, we published master without branch name # copy the files in this case such that both are published - cp $BUILD_DIR/coreos_production_pxe_image-oem.cpio.gz $BUILD_DIR/coreos_production_pxe_image-oem-$BRANCH_PATH.cpio.gz - cp $BUILD_DIR/coreos_production_pxe.vmlinuz $BUILD_DIR/coreos_production_pxe-$BRANCH_PATH.vmlinuz + sudo cp $BUILD_DIR/coreos_production_pxe_image-oem.cpio.gz $BUILD_DIR/coreos_production_pxe_image-oem-$BRANCH_PATH.cpio.gz + sudo cp $BUILD_DIR/coreos_production_pxe.vmlinuz $BUILD_DIR/coreos_production_pxe-$BRANCH_PATH.vmlinuz fi -tar czf ipa-coreos-$BRANCH_PATH.tar.gz $BUILD_DIR/coreos_production_pxe_image-oem-$BRANCH_PATH.cpio.gz $BUILD_DIR/coreos_production_pxe-$BRANCH_PATH.vmlinuz +sudo tar czf ipa-coreos-$BRANCH_PATH.tar.gz $BUILD_DIR/coreos_production_pxe_image-oem-$BRANCH_PATH.cpio.gz $BUILD_DIR/coreos_production_pxe-$BRANCH_PATH.vmlinuz if [ "$BRANCH_PATH" = "master" ]; then # again, publish with and without the branch on master for historical reasons - cp ipa-coreos-$BRANCH_PATH.tar.gz ipa-coreos.tar.gz + sudo cp ipa-coreos-$BRANCH_PATH.tar.gz ipa-coreos.tar.gz fi |