Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ make defconfig
cat >> .config <<EOF
CONFIG_VERSION_DIST="MFW"
CONFIG_VERSION_MANUFACTURER="Untangle"
CONFIG_VERSION_BUG_URL="https://jira.untangle.com/projects/MFW/"
CONFIG_VERSION_BUG_URL="https://jira.edge.arista.com/projects/MFW/"
CONFIG_VERSION_HOME_URL="https://github.com/untangle/mfw_feeds"
CONFIG_VERSION_SUPPORT_URL="https://support.untangle.com/hc/en-us/articles/360008238393"
CONFIG_VERSION_SUPPORT_URL="https://support.edge.arista.com/hc/en-us/articles/360008238393"
CONFIG_VERSION_PRODUCT="MFW"
EOF

Expand All @@ -209,7 +209,7 @@ if [ -n "$BUILD_URL" ] ; then # Jenkins build
x86_64) DEVICE=x86-64 ;;
esac
packagesList="mfw-${DEVICE}-Packages_${mfwVersion}_${SOURCE_DATE}.txt"
echo CONFIG_VERSION_MANUFACTURER_URL="https://downloads.untangle.com/public/mfw/${mfwShortVersion}/manifest/${packagesList}" >> .config
echo CONFIG_VERSION_MANUFACTURER_URL="https://downloads.edge.arista.com/public/mfw/${mfwShortVersion}/manifest/${packagesList}" >> .config
else
echo CONFIG_VERSION_MANUFACTURER_URL="developer build" >> .config
fi
Expand Down
2 changes: 1 addition & 1 deletion version-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ cp bin/packages/*/mfw/Packages ${OUTPUT_DIR}/${PACKAGES_FILE}
# also push that list to s3 (Jenkins should have the necessary AWS_*
# environment variables)
if [[ -n "$UPLOAD_TO_S3" ]] ; then
s3path="s3://downloads.untangle.com-temp/mfw/${SHORT_VERSION}/manifest/${PACKAGES_FILE}"
s3path="s3://downloads.edge.arista.com-temp/mfw/${SHORT_VERSION}/manifest/${PACKAGES_FILE}"
rc=1
for i in $(seq 1 5) ; do
if s3cmd put bin/packages/*/mfw/Packages $s3path ; then
Expand Down