Revision 5e4fae22
Added by Renato Botelho over 3 years ago
| tools/builder_common.sh | ||
|---|---|---|
| 1822 | 1822 |
OLDIFS=${IFS}
|
| 1823 | 1823 |
IFS=$'\n' |
| 1824 | 1824 |
echo ">>> Downloading cached pkgs for ${jail_arch} from S3.." | tee -a ${LOGFILE}
|
| 1825 |
for i in $(aws_exec s3 ls s3://pfsense-engineering-build-pkg/); do |
|
| 1826 |
echo ${i} | awk '{print $4}' | grep ${FLAVOR}-pkgs-${jail_arch}.tar > /dev/null
|
|
| 1827 |
if [ $? -eq 0 ]; then |
|
| 1828 |
aws_exec s3 cp s3://pfsense-engineering-build-pkg/${FLAVOR}-pkgs-${jail_arch}.tar . --no-progress
|
|
| 1829 |
[ ! -d /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME} ] && mkdir -p /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME}
|
|
| 1830 |
echo "Extracting ${FLAVOR}-pkgs-${jail_arch}.tar to /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME}" | tee -a ${LOGFILE}
|
|
| 1831 |
[ ! -d /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME} ] && mkdir /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME}
|
|
| 1832 |
script -aq ${LOGFILE} tar -xf ${FLAVOR}-pkgs-${jail_arch}.tar -C /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME}
|
|
| 1833 |
# Save a list of pkgs |
|
| 1834 |
cd /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME}/.latest
|
|
| 1835 |
find . > ${WORKSPACE}/pre-build-pkg-list-${jail_arch}
|
|
| 1836 |
cd ${WORKSPACE}
|
|
| 1837 |
else |
|
| 1838 |
touch pre-build-pkg-list-${jail_arch}
|
|
| 1839 |
fi |
|
| 1840 |
done |
|
| 1825 |
if aws_exec s3 ls s3://pfsense-engineering-build-pkg/${FLAVOR}-pkgs-${jail_arch}.tar >/dev/null 2>&1; then
|
|
| 1826 |
aws_exec s3 cp s3://pfsense-engineering-build-pkg/${FLAVOR}-pkgs-${jail_arch}.tar . --no-progress
|
|
| 1827 |
[ ! -d /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME} ] && mkdir -p /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME}
|
|
| 1828 |
echo "Extracting ${FLAVOR}-pkgs-${jail_arch}.tar to /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME}" | tee -a ${LOGFILE}
|
|
| 1829 |
[ ! -d /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME} ] && mkdir /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME}
|
|
| 1830 |
script -aq ${LOGFILE} tar -xf ${FLAVOR}-pkgs-${jail_arch}.tar -C /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME}
|
|
| 1831 |
# Save a list of pkgs |
|
| 1832 |
cd /usr/local/poudriere/data/packages/${jail_name}-${POUDRIERE_PORTS_NAME}/.latest
|
|
| 1833 |
find . > ${WORKSPACE}/pre-build-pkg-list-${jail_arch}
|
|
| 1834 |
cd ${WORKSPACE}
|
|
| 1835 |
else |
|
| 1836 |
touch pre-build-pkg-list-${jail_arch}
|
|
| 1837 |
fi |
|
| 1841 | 1838 |
IFS=${OLDIFS}
|
| 1842 | 1839 |
else |
| 1843 | 1840 |
if ! script -aq ${LOGFILE} poudriere jail -c -j "${jail_name}" -v ${FREEBSD_BRANCH} \
|
Also available in: Unified diff
AWS: Simplify logic using 's3 ls' to check if file exists