From ab582b8d3e95284d007076cd4d238054b2ed0307 Mon Sep 17 00:00:00 2001 From: TC Johnson Date: Fri, 19 Jul 2024 15:49:29 -0500 Subject: [PATCH] Another tweak to GitLab secure storage --- .gitlab-ci.yml | 6 +++--- .../cicd/build-orchestration/distribute-nightly-packages.sh | 2 +- .../cicd/build-orchestration/distribute-stable-packages.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85316d75..b6380960 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -168,7 +168,7 @@ build_repositories: tags: - build-orchestration variables: - SECURE_FILES_DOWNLOAD_PATH: '/home/gitlab-runner/' + SECURE_FILES_DOWNLOAD_PATH: './' script: - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash - cp scripts/cicd/build-orchestration/rpm-repo-building/Dockerfile ~/rpm-build-container @@ -283,7 +283,7 @@ dryrun_build_repositories: tags: - build-orchestration variables: - SECURE_FILES_DOWNLOAD_PATH: '/home/gitlab-runner/' + SECURE_FILES_DOWNLOAD_PATH: './' script: - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash - cp scripts/cicd/build-orchestration/generate-release.sh ~ @@ -373,7 +373,7 @@ nightly_build_repositories: tags: - build-orchestration variables: - SECURE_FILES_DOWNLOAD_PATH: '/home/gitlab-runner/' + SECURE_FILES_DOWNLOAD_PATH: './' script: - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash - cp scripts/cicd/build-orchestration/generate-nightly-release.sh ~ diff --git a/scripts/cicd/build-orchestration/distribute-nightly-packages.sh b/scripts/cicd/build-orchestration/distribute-nightly-packages.sh index 805e3b94..16ed84a3 100644 --- a/scripts/cicd/build-orchestration/distribute-nightly-packages.sh +++ b/scripts/cicd/build-orchestration/distribute-nightly-packages.sh @@ -10,7 +10,7 @@ rm -rf $HOME/srv/rpm/nightly/x86_64/* # Setup crypto export GNUPGHOME="$(mktemp -d ~/pgpkeys-XXXXXX)" -cat $HOME/veilid-packages-key.private | gpg --import +cat veilid-packages-key.private | gpg --import gpg --armor --export admin@veilid.org > $HOME/srv/gpg/veilid-packages-key.public # Copy .deb files into the workspace and generate repo files diff --git a/scripts/cicd/build-orchestration/distribute-stable-packages.sh b/scripts/cicd/build-orchestration/distribute-stable-packages.sh index 02865f74..8facab11 100644 --- a/scripts/cicd/build-orchestration/distribute-stable-packages.sh +++ b/scripts/cicd/build-orchestration/distribute-stable-packages.sh @@ -10,7 +10,7 @@ rm -rf $HOME/srv/rpm/stable/x86_64/* # Setup crypto export GNUPGHOME="$(mktemp -d ~/pgpkeys-XXXXXX)" -cat $HOME/veilid-packages-key.private | gpg --import +cat veilid-packages-key.private | gpg --import gpg --armor --export admin@veilid.org > $HOME/srv/gpg/veilid-packages-key.public # Copy .deb files into the workspace and generate repo files @@ -39,7 +39,7 @@ tar -xf amd64-rpms.tar echo "Copying rpms to container workspace" cp *x86_64.rpm $HOME/rpm-build-container/mount/repo/stable/x86_64 echo "Copying signing material to container workspace" -cp -R $GNUPGHOME $HOME/rpm-build-container/mount/keystore +cp -R $GNUPGHOME/* $HOME/rpm-build-container/mount/keystore echo "Executing container actions" docker run --rm -d -it --name rpm-repo-builder --mount type=bind,source=$HOME/rpm-build-container/mount,target=/mount rpm-repo-builder-img:v12 sleep 2