From 5490dc8faa25a243231bc27836f86ab2de22000e Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Tue, 5 Oct 2021 16:41:03 +0200 Subject: [PATCH] pipeline: Clean-up AWS keys manipulation for temp bucket This is now handled by the code in mendertesting, see: https://github.com/mendersoftware/mendertesting/pull/160 Changelog: None Signed-off-by: Lluis Campos --- .gitlab-ci.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e5cb3b..a20ac3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,9 +98,6 @@ build: tags: - mender-qa-slave before_script: - - export AWS_ACCESS_KEY_ID=$TMP_STORAGE_AWS_ACCESS_KEY_ID - - export AWS_SECRET_ACCESS_KEY=$TMP_STORAGE_AWS_SECRET_ACCESS_KEY - - apt update && apt install -yy bash wget unzip awscli docker.io curl - export IMAGE_NAME=$DOCKER_REPOSITORY:pr @@ -149,8 +146,6 @@ convert_raspbian_raspberrypi4: - mender-qa-slave timeout: 2h before_script: - - export AWS_ACCESS_KEY_ID=$TMP_STORAGE_AWS_ACCESS_KEY_ID - - export AWS_SECRET_ACCESS_KEY=$TMP_STORAGE_AWS_SECRET_ACCESS_KEY # Install dependencies - apt update - apt install -qyy bash wget git util-linux mtools python3 python3-pip @@ -250,10 +245,6 @@ test_acceptance_ubuntu: stage: publish image: debian:buster before_script: - - export PUBLISH_AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID - - export PUBLISH_AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY - - export AWS_ACCESS_KEY_ID=$TMP_STORAGE_AWS_ACCESS_KEY_ID - - export AWS_SECRET_ACCESS_KEY=$TMP_STORAGE_AWS_SECRET_ACCESS_KEY - apt update && apt install -yyq awscli curl - eval "$(curl https://raw.githubusercontent.com/mendersoftware/mendertesting/master/mender-ci-common.sh)" # Fetch artifacts from temporary S3 bucket @@ -262,10 +253,6 @@ test_acceptance_ubuntu: - tar xzf ${RASPBERRYPI_PLATFORM}.tar.gz - done script: - # Prepare high privilege S3 keys (the TMP_STORAGE keys are for the tmp storage only) - - export AWS_ACCESS_KEY_ID=$PUBLISH_AWS_ACCESS_KEY_ID - - export AWS_SECRET_ACCESS_KEY=$PUBLISH_AWS_SECRET_ACCESS_KEY - - IMAGE_VERSION=${MENDER_CONVERT_PUBLISH_VERSION:-${CI_COMMIT_REF_NAME}} - for RASPBERRYPI_PLATFORM in raspberrypi3 raspberrypi4; do