You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2023/11/18 19:52:01 UTC
(airflow) branch add-more-disk-for-arm-instance updated (494b5a4f95 -> e1c576e31e)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a change to branch add-more-disk-for-arm-instance
in repository https://gitbox.apache.org/repos/asf/airflow.git
omit 494b5a4f95 fixup! Add more disk space for ARM image
new e1c576e31e fixup! Add more disk space for ARM image
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (494b5a4f95)
\
N -- N -- N refs/heads/add-more-disk-for-arm-instance (e1c576e31e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
scripts/ci/images/ci_start_arm_instance_and_connect_to_docker.sh | 3 +--
scripts/ci/images/file_mapping.json | 6 ------
2 files changed, 1 insertion(+), 8 deletions(-)
delete mode 100644 scripts/ci/images/file_mapping.json
(airflow) 01/01: fixup! Add more disk space for ARM image
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch add-more-disk-for-arm-instance
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit e1c576e31ec3e100721fe834d89ee5abbbaffb8c
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sat Nov 18 19:33:12 2023 +0100
fixup! Add more disk space for ARM image
---
.github/workflows/ci.yml | 38 +++++++++++-----------
.../ci_start_arm_instance_and_connect_to_docker.sh | 3 +-
scripts/ci/images/file_mapping.json | 6 ----
3 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7a9ffb2251..35037c32f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -212,20 +212,20 @@ jobs:
steps:
- name: Cleanup repo
run: docker run -v "${GITHUB_WORKSPACE}:/workspace" -u 0:0 bash -c "rm -rf /workspace/*"
- if: needs.build-info.outputs.canary-run == 'true' && needs.build-info.outputs.default-branch == 'main'
+ # if: needs.build-info.outputs.canary-run == 'true' && needs.build-info.outputs.default-branch == 'main'
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v4
with:
persist-credentials: false
- if: needs.build-info.outputs.canary-run == 'true' && needs.build-info.outputs.default-branch == 'main'
+ # if: needs.build-info.outputs.canary-run == 'true' && needs.build-info.outputs.default-branch == 'main'
- name: "Install Breeze"
uses: ./.github/actions/breeze
- if: needs.build-info.outputs.canary-run == 'true' && needs.build-info.outputs.default-branch == 'main'
+ # if: needs.build-info.outputs.canary-run == 'true' && needs.build-info.outputs.default-branch == 'main'
- name: "Start ARM instance"
run: ./scripts/ci/images/ci_start_arm_instance_and_connect_to_docker.sh
- if: >
- matrix.platform == 'linux/arm64' && needs.build-info.outputs.canary-run == 'true'
- && needs.build-info.outputs.default-branch == 'main'
+ # if: >
+ # matrix.platform == 'linux/arm64' && needs.build-info.outputs.canary-run == 'true'
+ # && needs.build-info.outputs.default-branch == 'main'
- name: "Push CI cache ${{ matrix.platform }}"
run: >
breeze ci-image build
@@ -237,7 +237,7 @@ jobs:
env:
DEBUG_RESOURCES: ${{needs.build-info.outputs.debug-resources}}
COMMIT_SHA: ${{ github.sha }}
- if: needs.build-info.outputs.canary-run == 'true' && needs.build-info.outputs.default-branch == 'main'
+ # if: needs.build-info.outputs.canary-run == 'true' && needs.build-info.outputs.default-branch == 'main'
- name: "Push CI latest image ${{ matrix.platform }}"
run: >
breeze ci-image build
@@ -247,24 +247,24 @@ jobs:
COMMIT_SHA: ${{ github.sha }}
# We only push "amd" image as it is really only needed for any kind of automated builds in CI
# and currently there is not an easy way to make multi-platform image from two separate builds
- if: >
- matrix.platform == 'linux/amd64' && needs.build-info.outputs.canary-run == 'true'
- && needs.build-info.outputs.default-branch == 'main'
+ # if: >
+ # matrix.platform == 'linux/amd64' && needs.build-info.outputs.canary-run == 'true'
+ # && needs.build-info.outputs.default-branch == 'main'
- name: "Stop ARM instance"
run: ./scripts/ci/images/ci_stop_arm_instance.sh
- if: >
- always() && matrix.platform == 'linux/arm64' && needs.build-info.outputs.canary-run == 'true'
- && needs.build-info.outputs.default-branch == 'main'
+ # if: >
+ # always() && matrix.platform == 'linux/arm64' && needs.build-info.outputs.canary-run == 'true'
+ # && needs.build-info.outputs.default-branch == 'main'
- name: "Clean docker cache for ${{ matrix.platform }}"
run: docker system prune --all --force
- if: >
- matrix.platform == 'linux/amd64' && needs.build-info.outputs.canary-run == 'true'
- && needs.build-info.outputs.default-branch == 'main'
+ # if: >
+ # matrix.platform == 'linux/amd64' && needs.build-info.outputs.canary-run == 'true'
+ # && needs.build-info.outputs.default-branch == 'main'
- name: "Fix ownership"
run: breeze ci fix-ownership
- if: >
- always() && needs.build-info.outputs.canary-run == 'true'
- && needs.build-info.outputs.default-branch == 'main'
+ # if: >
+ # always() && needs.build-info.outputs.canary-run == 'true'
+ # && needs.build-info.outputs.default-branch == 'main'
# Check that after earlier cache push, breeze command will build quickly
check-that-image-builds-quickly:
timeout-minutes: 5
diff --git a/scripts/ci/images/ci_start_arm_instance_and_connect_to_docker.sh b/scripts/ci/images/ci_start_arm_instance_and_connect_to_docker.sh
index 6e7047daf6..5b4ba4ed16 100755
--- a/scripts/ci/images/ci_start_arm_instance_and_connect_to_docker.sh
+++ b/scripts/ci/images/ci_start_arm_instance_and_connect_to_docker.sh
@@ -25,7 +25,6 @@ MARKET_OPTIONS="MarketType=spot,SpotOptions={MaxPrice=0.25,SpotInstanceType=one-
REGION="us-east-2"
EC2_USER="ec2-user"
USER_DATA_FILE="${SCRIPTS_DIR}/initialize.sh"
-MAPPING_FILE="${SCRIPTS_DIR}/file_mapping.json"
METADATA_ADDRESS="http://169.254.169.254/latest/meta-data"
MAC_ADDRESS=$(curl -s "${METADATA_ADDRESS}/network/interfaces/macs/" | head -n1 | tr -d '/')
CIDR=$(curl -s "${METADATA_ADDRESS}/network/interfaces/macs/${MAC_ADDRESS}/vpc-ipv4-cidr-block/")
@@ -39,7 +38,7 @@ function start_arm_instance() {
--image-id "${ARM_AMI}" \
--count 1 \
--instance-type "${INSTANCE_TYPE}" \
- --blockd-device-mappings "file://${MAPPING_FILE}" \
+ --block-device-mappings 'DeviceName=/dev/xvda,Ebs={VolumeSize=16}' \
--user-data "file://${USER_DATA_FILE}" \
--instance-market-options "${MARKET_OPTIONS}" \
--instance-initiated-shutdown-behavior terminate \
diff --git a/scripts/ci/images/file_mapping.json b/scripts/ci/images/file_mapping.json
deleted file mode 100644
index b144e995a0..0000000000
--- a/scripts/ci/images/file_mapping.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "DeviceName": "/dev/xvda",
- "Ebs": {
- "VolumeSize": 16
- }
-}