containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Fix not growing Fedora root 

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2020-02-27 14:08:52 -05:00
parent baf27fa25e
commit 42f04bbdaf
No known key found for this signature in database
GPG Key ID: 03EDC70FD578067F
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/cirrus/setup_environment.sh
View File

@ -46,7 +46,8 @@ case "${OS_RELEASE_ID}" in
# All SELinux distros need this for systemd-in-a-container # All SELinux distros need this for systemd-in-a-container
setsebool container_manage_cgroup true setsebool container_manage_cgroup true
if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
bash "$SCRIPT_BASE/add_second_partition.sh"; fi bash "$SCRIPT_BASE/add_second_partition.sh"
fi
if [[ "$OS_RELEASE_VER" == "31" ]]; then if [[ "$OS_RELEASE_VER" == "31" ]]; then
warn "Switching io schedular to deadline to avoid RHBZ 1767539" warn "Switching io schedular to deadline to avoid RHBZ 1767539"

4
hack/get_ci_vm.sh
View File

@ -96,7 +96,7 @@ env=yaml.load(open(".cirrus.yml"), Loader=yaml.SafeLoader)["env"]
keys=[k for k in env if "ENCRYPTED" not in str(env[k])] keys=[k for k in env if "ENCRYPTED" not in str(env[k])]
for k,v in env.items(): for k,v in env.items():
v=str(v) v=str(v)
if "ENCRYPTED" not in v: if "ENCRYPTED" not in v and "ADD_SECOND_PARTITION" not in v:
print("{0}=\"{1}\"".format(k, v)), print("{0}=\"{1}\"".format(k, v)),
' '
} }
@ -181,7 +181,7 @@ parse_args(){
[[ -z "$ROOTLESS_USER" ]] || \ [[ -z "$ROOTLESS_USER" ]] || \
ENVS="$ENVS ROOTLESS_USER=$ROOTLESS_USER" ENVS="$ENVS ROOTLESS_USER=$ROOTLESS_USER"
SETUP_CMD="env $ENVS $GOSRC/contrib/cirrus/setup_environment.sh" SETUP_CMD="env $ENVS ADD_SECOND_PARTITIO=True $GOSRC/contrib/cirrus/setup_environment.sh"
VMNAME="${VMNAME:-${USER}-${IMAGE_NAME}}" VMNAME="${VMNAME:-${USER}-${IMAGE_NAME}}"
CREATE_CMD="$PGCLOUD compute instances create --zone=$ZONE --image=${IMAGE_NAME} --custom-cpu=$CPUS --custom-memory=$MEMORY --boot-disk-size=$DISK --labels=in-use-by=$USER $IBI_ARGS $VMNAME" CREATE_CMD="$PGCLOUD compute instances create --zone=$ZONE --image=${IMAGE_NAME} --custom-cpu=$CPUS --custom-memory=$MEMORY --boot-disk-size=$DISK --labels=in-use-by=$USER $IBI_ARGS $VMNAME"