From c8c6be0e648943f1e52481fd4a1e0f867eda5851 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Fri, 12 Feb 2021 10:41:49 -0500
Subject: [PATCH] deploy: Do not generate a bogus options file in the
repository.
It was recording the Jenkins build workspace, which cannot be useful:
root@jami-repovm-01:/srv/repository/ring/nightly# find -name options -exec cat {} +
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic@2/ring-project/repositories/ubuntu_20.10
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic@6/ring-project/repositories/debian_9
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic@2/ring-project/repositories/ubuntu_17.04
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic@5/ring-project/repositories/ubuntu_20.04
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic@4/ring-project/repositories/ubuntu_16.04
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic@2/ring-project/repositories/ubuntu_17.10
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic@6/ring-project/repositories/raspbian_10
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic/ring-project/repositories/ubuntu_19.04
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic/ring-project/repositories/ubuntu_18.04
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic@4/ring-project/repositories/ubuntu_18.10
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic@4/ring-project/repositories/debian_10
basedir /var/lib/jenkins/workspace/packaging-deploy-gnulinux-generic/ring-project/repositories/ubuntu_19.10
Change-Id: I3b50d78c8b2c084e2e510f5b37958762db9ff185
---
scripts/deploy-packages.sh | 5 -----
1 file changed, 5 deletions(-)
diff --git a/scripts/deploy-packages.sh b/scripts/deploy-packages.sh
index 676747e3..8e9e99fd 100755
--- a/scripts/deploy-packages.sh
+++ b/scripts/deploy-packages.sh
@@ -52,11 +52,6 @@ Architectures: i386 amd64 armhf arm64
Components: main
Description: This repository contains Ring ${DISTRIBUTION} packages
SignWith: ${KEYID}
-EOF
-
- # Options file
- cat << EOF > ${DISTRIBUTION_REPOSITOIRY_FOLDER}/conf/options
-basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER}
EOF
####################################
--
GitLab