diff --git a/jenkins/jobs/packaging-mirror.yaml b/jenkins/jobs/packaging-mirror.yaml index b0c23a4aa2..2e0912ed8d 100644 --- a/jenkins/jobs/packaging-mirror.yaml +++ b/jenkins/jobs/packaging-mirror.yaml @@ -4,12 +4,16 @@ - shell: | #!/bin/bash -xe - AFS_DIR=/afs/.openstack.org/mirror/deb-openstack + BASE=/afs/.openstack.org/mirror/deb-openstack BRANCH=$(echo $ZUUL_REFNAME | cut -d/ -f2) PACKAGE_DIR=$WORKSPACE/packages PROJECT=$(echo $ZUUL_PROJECT | cut -d/ -f2) URL=http://tarballs.openstack.org/packaging-deb/$PROJECT/uploads/$ZUUL_COMMIT + K5START="k5start -t -f /etc/packaging.keytab \ + service/packaging \ + -- timeout -k 2m 30m" + # Build up which distribution we are using. Here we will be # converting: # jessie-> jessie-newton @@ -35,10 +39,7 @@ --directory-prefix=$PACKAGE_DIR \ $URL/ - REPREPRO="k5start -t -f /etc/packaging.keytab \ - service/packaging \ - -- timeout -k 2m 30m \ - reprepro --confdir /etc/reprepro/{reprepro}" + REPREPRO="$K5START reprepro --confdir /etc/reprepro/{reprepro}" # Get an afs token and import the packages to reprepro echo "Obtaining token and importing packages to reprepro" @@ -54,6 +55,7 @@ echo "List all packages" $REPREPRO list $DISTRIBUTION + date --iso-8601=ns | $K5START tee $BASE/timestamp.txt echo "Done." - builder: diff --git a/jenkins/scripts/reprepro-gpg-sign.sh b/jenkins/scripts/reprepro-gpg-sign.sh index 0e047f2068..da952fcda7 100755 --- a/jenkins/scripts/reprepro-gpg-sign.sh +++ b/jenkins/scripts/reprepro-gpg-sign.sh @@ -14,7 +14,7 @@ # under the License. CODENAME=$1 -AFS_DIR=/afs/.openstack.org/mirror/debian-openstack +BASE=/afs/.openstack.org/mirror/debian-openstack BRANCH=$(echo $ZUUL_REFNAME | cut -d/ -f2) K5START="k5start -t -f /etc/packaging.keytab \ service/packaging \ @@ -31,7 +31,9 @@ if ! [ -z "${array[1]}" ]; then DISTRIBUTION+="-${array[1]}" fi -cd $AFS_DIR/dists/$DISTRIBUTION +cd $BASE/dists/$DISTRIBUTION $K5START gpg --armor --detach-sign --output Release.gpg Release $K5START gpg --armor --clearsign --output InRelease Release + +date --iso-8601=ns | $K5START tee $BASE/timestamp.txt