Skip to content

Commit e1de0e6

Browse files
committed
[ISV-5091] Optimize container tool storage handling
Signed-off-by: Mario Varas <[email protected]>
1 parent f2271fe commit e1de0e6

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

ci/scripts/opp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ OPP_CONTAINER_RUN_EXTRA_ARGS=${OPP_CONTAINER_RUN_EXTRA_ARGS-""}
4242
OPP_CONTAINER_EXEC_DEFAULT_ARGS=${OPP_CONTAINER_EXEC_DEFAULT_ARGS-""}
4343
OPP_CONTAINER_EXEC_EXTRA_ARGS=${OPP_CONTAINER_EXEC_EXTRA_ARGS-""}
4444
OPP_EXEC_BASE=${OPP_EXEC_BASE-"ansible-playbook -i localhost, -e ansible_connection=local upstream/local.yml -e run_upstream=true -e image_protocol='docker://'"}
45-
OPP_EXEC_EXTRA=${OPP_EXEC_EXTRA-"-e container_tool=podman"}
45+
OPP_EXEC_EXTRA=${OPP_EXEC_EXTRA-"-e container_tool=podman -e optimize_build_storage=true -e container_tool_extra_params='--storage-driver=overlay --tmpdir=/mnt/tmp --log-level=info'"}
4646
OPP_RUN_MODE=${OPP_RUN_MODE-"privileged"}
4747
OPP_LABELS=${OPP_LABELS-""}
4848
OPP_PROD=${OPP_PROD-0}

ci/templates/workflow/operator_release.yaml.js2

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,10 @@ jobs:
350350
ANSIBLE_FORCE_COLOR: 1
351351
ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
352352
ANSIBLE_STDOUT_CALLBACK: "yaml"
353+
TMPDIR: "/mnt/tmp"
353354
run: |
355+
sudo mkdir -p "${TMPDIR}"
356+
sudo chmod 1777 "${TMPDIR}"
354357
OPP_FORCE_OPERATORS=${OPP_FORCE_OPERATORS// /,}
355358
echo $OPP_FORCE_OPERATORS
356359
[ "$OPP_AUTO_LABEL" = '1' ] && ANSIBLE_ARGS="-e automatic_cluster_version_label=true" || ANSIBLE_ARGS="-e automatic_cluster_version_label=false"
@@ -695,7 +698,10 @@ jobs:
695698
ANSIBLE_FORCE_COLOR: 1
696699
ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
697700
ANSIBLE_STDOUT_CALLBACK: "yaml"
701+
TMPDIR: "/mnt/tmp"
698702
run: |
703+
sudo mkdir -p "${TMPDIR}"
704+
sudo chmod 1777 "${TMPDIR}"
699705
OPP_FORCE_OPERATORS=${OPP_FORCE_OPERATORS// /,}
700706
echo $OPP_FORCE_OPERATORS
701707
[ "$OPP_AUTO_LABEL" = '1' ] && ANSIBLE_ARGS="-e automatic_cluster_version_label=true" || ANSIBLE_ARGS="-e automatic_cluster_version_label=false"
@@ -937,7 +943,10 @@ jobs:
937943
id: index-verify
938944
env:
939945
OPP_CONTAINER_TOOL: podman
946+
TMPDIR: "/mnt/tmp"
940947
run: |
948+
sudo mkdir -p "${TMPDIR}"
949+
sudo chmod 1777 "${TMPDIR}"
941950
MY_TAG=${{ matrix.index-tag }}
942951
MY_TAG=$(echo $MY_TAG | cut -d '-' -f 1)
943952
{% endraw %}
@@ -966,9 +975,12 @@ jobs:
966975
{% endraw %}
967976
OHIO_INPUT_CATALOG_IMAGE: "{{ default_config.production.index.registry }}/{{ default_config.production.index.organization }}/{{ default_config.production.index.name }}:latest"
968977
OHIO_REGISTRY_IMAGE: "{{ default_config.operatorhubio.registry }}/{{ default_config.operatorhubio.organization }}/{{ default_config.operatorhubio.name }}:{{ default_config.operatorhubio.tag }}"
978+
TMPDIR: "/mnt/tmp"
969979
{% raw %}
970980
steps:
971981
- name: Ohio image
982+
env:
983+
TMPDIR: "/mnt/tmp"
972984
run: |
973985
echo "ohio_image operators/sync $OPP_THIS_REPO $OPP_THIS_BRANCH"
974986
bash <(curl -sL $OPP_SCRIPT_CLEANUP_URL)

0 commit comments

Comments
 (0)