From 3e00a053011d1a154859fd3940344967cb8d5f73 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Sat, 14 Oct 2023 15:35:11 +0200 Subject: [PATCH] [CI/CD] Restored `awscli` process for `update-debian-oldstable-packages`. The `s3fs` flow seems to have problems on the Debian oldstable image. --- .drone.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index e2723678c..6f283d717 100644 --- a/.drone.yml +++ b/.drone.yml @@ -432,13 +432,11 @@ steps: - name: update-debian-oldstable-packages image: debian:oldstable - privileged: true # Required to use the FUSE module for s3fs environment: DEB_VERSION: oldstable WORKDIR: /tmp/workdir PKG_NAME: platypush - S3_BUCKET: platypush-pkg - BUCKET_MNT: /mnt/s3 + S3_URL: s3://platypush-pkg/apt AWS_ENDPOINT_URL: https://s3.nl-ams.scw.cloud AWS_DEFAULT_REGION: nl-ams AWS_ACCESS_KEY_ID: @@ -464,12 +462,8 @@ steps: - echo "-- Installing dependencies" - apt update - - apt install -y curl dpkg-dev gpg git python3 python3-pip s3fs - - - echo "-- Mounting the S3 bucket" - - mkdir -p "$BUCKET_MNT" - - s3fs "$S3_BUCKET" "$BUCKET_MNT" -o url="$AWS_ENDPOINT_URL" - - export APT_ROOT="$BUCKET_MNT/apt" + - apt install -y curl dpkg-dev gpg git python3 python3-pip + - pip install awscli - echo "--- Parsing metadata" - git config --global --add safe.directory $PWD @@ -501,8 +495,7 @@ steps: - dpkg --build "$GIT_BUILD_DIR" - echo "--- Pushing package to the S3 bucket" - - mkdir -p "$APT_ROOT/pool/$DEB_VERSION/dev" - - cp "$GIT_DEB" "$APT_ROOT/pool/$DEB_VERSION/dev/" + - aws s3 cp "$GIT_DEB" "$S3_URL/pool/$DEB_VERSION/dev/" # If main/all/Packages doesn't exist, then we should create the first main release - export PKGURL="https://apt.platypush.tech/dists/$DEB_VERSION/main/all/Packages"