diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-28 20:31:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 20:31:57 +0100 |
| commit | 275e9b855dd0a384a283174912c08f3f097101b5 (patch) | |
| tree | d4033df5267c5913d644608934a0f7516c8a1805 /hack | |
| parent | 742093c2f27d79a76dbc45335e6f9458decff567 (diff) | |
| parent | e95c493fec5cab6e487d73649641cec0c1567d2c (diff) | |
| download | podman-275e9b855dd0a384a283174912c08f3f097101b5.tar.gz podman-275e9b855dd0a384a283174912c08f3f097101b5.tar.bz2 podman-275e9b855dd0a384a283174912c08f3f097101b5.zip | |
Merge pull request #5342 from cevich/runc_in_f30
Force using runc in F30
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/get_ci_vm.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh index 768137213..7e31c19c6 100755 --- a/hack/get_ci_vm.sh +++ b/hack/get_ci_vm.sh @@ -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])] for k,v in env.items(): 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)), ' } @@ -181,7 +181,7 @@ parse_args(){ [[ -z "$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}}" 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" |