summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcron-jobs/adjust-permissions2
-rwxr-xr-xcron-jobs/create-filelists2
-rwxr-xr-xcron-jobs/sourceballs2
-rw-r--r--db-functions2
-rw-r--r--test/lib/common.inc4
5 files changed, 7 insertions, 5 deletions
diff --git a/cron-jobs/adjust-permissions b/cron-jobs/adjust-permissions
index c28ca7c..6acfcf2 100755
--- a/cron-jobs/adjust-permissions
+++ b/cron-jobs/adjust-permissions
@@ -13,6 +13,8 @@ get_dir_owner() {
echo "ftp:ftp-extra" ;;
testing)
echo "ftp:ftp-extra" ;;
+ staging)
+ echo "ftp:ftp-extra" ;;
community)
echo "root:tusers" ;;
community-testing)
diff --git a/cron-jobs/create-filelists b/cron-jobs/create-filelists
index 9249408..fd07617 100755
--- a/cron-jobs/create-filelists
+++ b/cron-jobs/create-filelists
@@ -5,7 +5,7 @@
reposdir=${FTP_BASE}
targetdir=${FTP_BASE}
-repos=(core extra testing community community-testing)
+repos=(core extra testing community community-testing staging)
script_lock
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index b82e375..a6f7a19 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -5,7 +5,7 @@
ftpbase="${FTP_BASE}"
srcbase="${FTP_BASE}/sources"
-repos=(core extra testing community community-testing)
+repos=(core extra testing community community-testing staging)
script_lock
diff --git a/db-functions b/db-functions
index 015f254..a04dbf5 100644
--- a/db-functions
+++ b/db-functions
@@ -315,7 +315,7 @@ get_repos_for_host() {
if [ "$(hostname)" = "sigurd" ]; then
echo "community community-testing"
else
- echo "core extra testing"
+ echo "core extra testing staging"
fi
}
diff --git a/test/lib/common.inc b/test/lib/common.inc
index e55ce38..a79558c 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -31,9 +31,9 @@ setUp() {
#msg "Using ${TMP}"
mkdir -p "${TMP}/"{ftp,tmp,staging,{package,source}-cleanup,svn-{packages,community}-{copy,repo}}
- mkdir -p "${TMP}/ftp/"{core,extra,community,testing,community-testing}/os/{i686,any,x86_64}
+ mkdir -p "${TMP}/ftp/"{core,extra,community,testing,community-testing,staging}/os/{i686,any,x86_64}
mkdir -p "${TMP}/ftp/pool/"{packages,community}
- mkdir -p "${TMP}/staging/"{core,extra,community,testing,community-testing}
+ mkdir -p "${TMP}/staging/"{core,extra,community,testing,community-testing,staging}
msg 'Creating svn repository...'
svnadmin create "${TMP}/svn-packages-repo"