[ARVADOS-DEV] created: 680f3a3c0e6092013126959188a06c1b8bc5ce4c

[Git user]

        at  680f3a3c0e6092013126959188a06c1b8bc5ce4c (commit)


commit 680f3a3c0e6092013126959188a06c1b8bc5ce4c
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Dec 22 14:56:34 2020 -0500

    We've made a change in the structure of our apt repositories.
    
    refs #17218
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/jenkins/packer-images/jenkins-image-k8s-tests.sh b/jenkins/packer-images/jenkins-image-k8s-tests.sh
index af409e7..657e371 100755
--- a/jenkins/packer-images/jenkins-image-k8s-tests.sh
+++ b/jenkins/packer-images/jenkins-image-k8s-tests.sh
@@ -6,7 +6,7 @@
 
 set -eo pipefail
 
-echo "deb http://apt.arvados.org/ buster main" | sudo  tee /etc/apt/sources.list.d/arvados.list
+echo "deb http://apt.arvados.org/buster buster main" | sudo  tee /etc/apt/sources.list.d/arvados.list
 
 # Install a few dependencies
 sudo DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install gnupg2 wget git default-jdk docker.io netcat
diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index aadc004..41f0852 100755
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -188,8 +188,8 @@ class DebianPackageSuite(DistroPackageSuite):
     FREIGHT_SCRIPT = """
 cd "$1"; shift
 DISTNAME=$1; shift
-freight add "$@" "apt/$DISTNAME"
-freight cache "apt/$DISTNAME"
+aptly repo add "$DISTNAME" "$@"
+aptly publish update "$DISTNAME" filesystem:"${DISTNAME%-*}":
 rm "$@"
 """
 
diff --git a/jenkins/testing_to_stable_publish_packages.sh b/jenkins/testing_to_stable_publish_packages.sh
index 678256f..419339d 100755
--- a/jenkins/testing_to_stable_publish_packages.sh
+++ b/jenkins/testing_to_stable_publish_packages.sh
@@ -8,7 +8,6 @@
 #   --packages list of packages, comma separated, to move from dev_repo_dir to prod_repo_dir
 #   --distros  list of distros, comma separated, to which to publish packages
 
-APT_REPO_BASE_DIR="/var/lib/freight"
 RPM_REPO_BASE_DIR="/var/www/rpm.arvados.org"
 
 ###  MAIN  ####################################################################
@@ -73,23 +72,12 @@ if ( echo ${DIST_LIST} |grep -q centos ); then
 else
   for DISTNAME in ${DIST_LIST}; do
     ADDED=()
-    cd ${APT_REPO_BASE_DIR}
-    mkdir -p ${APT_REPO_BASE_DIR}/apt/${DISTNAME}
     echo "Copying packages ..."
     for P in ${PACKAGES}; do
-      cp ${APT_REPO_BASE_DIR}/apt/${DISTNAME}-testing/${P} ${APT_REPO_BASE_DIR}/apt/${DISTNAME}/
-      if [ $? -ne 0 ]; then
-        FAILED_PACKAGES="${FAILED_PACKAGES} ${P}"
-      else
-        TMP=`ls -C1 ${APT_REPO_BASE_DIR}/apt/${DISTNAME}-testing/${P}`
-        ADDED+=( "${TMP[@]}" )
-      fi
-    done
-    for P in "${ADDED[@]}"; do
-      freight add apt/${DISTNAME}/$(basename ${P}) apt/${DISTNAME}
+      aptly repo copy ${DISTNAME}-testing ${DISTNAME} $(basename ${P})
     done
-    echo "Recreating repo apt/${DISTNAME} ..."
-    freight cache apt/${DISTNAME}
+    echo "Publishing ${DISTNAME} repository..."
+    aptly publish update ${DISTNAME} filesystem:${DISTNAME}:
   done
 fi
 
diff --git a/jenkins/upload_packages_testing_to_stable.sh b/jenkins/upload_packages_testing_to_stable.sh
index 16c44f4..87e12f9 100755
--- a/jenkins/upload_packages_testing_to_stable.sh
+++ b/jenkins/upload_packages_testing_to_stable.sh
@@ -3,9 +3,9 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-# This script publishes packages from our dev repo to the prod repo (#11572)
-# Parameters: list of packages, space separated, to move from *-testing to *
-# under /var/lib/freight/apt/ in host public.curoverse.com
+# This script publishes packages from our testing repo to the prod repo
+# (#11572)
+# Parameters: list of packages, space separated, to copy from *-testing to *
 
 APT_REPO_SERVER="apt.arvados.org"
 RPM_REPO_SERVER="rpm.arvados.org"

-----------------------------------------------------------------------


hooks/post-receive
--