Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(RE-12326) Changes to public release package links #402

Merged
merged 1 commit into from
Apr 29, 2019
Merged

(RE-12326) Changes to public release package links #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 docker/centos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ LABEL before=${before}
# Install proper FROM repo: PC1 (puppet 4), puppet 5, or puppet 6.
RUN if [[ ${before} == 1.* ]]; then \
echo Installing PC1 repo; \
wget -O puppet-pc1.rpm http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm && \
wget -O puppet-pc1.rpm http://yum.puppet.com/puppetlabs-release-pc1-el-7.noarch.rpm && \
rpm -i puppet-pc1.rpm; \
elif [[ ${before} == 5.* ]]; then \
echo Installing PC1 repo; \
wget -O puppet5.rpm http://yum.puppetlabs.com/puppet5/puppet5-release-el-7.noarch.rpm && \
wget -O puppet5.rpm http://yum.puppet.com/puppet5-release-el-7.noarch.rpm && \
rpm -i puppet5.rpm; \
elif [[ ${before} == 6.* ]]; then \
echo Installing PC1 repo; \
wget -O puppet6.rpm http://yum.puppetlabs.com/puppet6/puppet6-release-el-7.noarch.rpm && \
wget -O puppet6.rpm http://yum.puppet.com/puppet6-release-el-7.noarch.rpm && \
rpm -i puppet6.rpm; \
else echo no; \
fi
Expand Down
6 changes: 3 additions & 3 deletions docker/centos/Dockerfile.versions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ RUN yum update -y \
&& yum clean all

# Install several repos: PC1 (puppet 4), puppet 5, and puppet 6.
RUN wget -O puppet-pc1.rpm http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm && \
RUN wget -O puppet-pc1.rpm http://yum.puppet.com/puppetlabs-release-pc1-el-7.noarch.rpm && \
rpm -i puppet-pc1.rpm --force --replacefiles && \
wget -O puppet5.rpm http://yum.puppetlabs.com/puppet5/puppet5-release-el-7.noarch.rpm && \
wget -O puppet5.rpm http://yum.puppet.com/puppet5-release-el-7.noarch.rpm && \
rpm -i puppet5.rpm --force --replacefiles && \
wget -O puppet6.rpm http://yum.puppetlabs.com/puppet6/puppet6-release-el-7.noarch.rpm && \
wget -O puppet6.rpm http://yum.puppet.com/puppet6-release-el-7.noarch.rpm && \
rpm -i puppet6.rpm --force --replacefiles --nodeps

# Print out available package versions for puppet-agent. If a specific version
Expand Down
25 changes: 20 additions & 5 deletions tasks/install_shell.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ if [ -n "$PT_version" ]; then
fi

if [ -n "$PT_collection" ]; then
# Check whether collection is nightly
if [[ "$PT_collection" == *"nightly"* ]]; then
nightly=true
else
nightly=false
fi

collection=$PT_collection
else
collection='puppet'
Expand All @@ -49,13 +56,21 @@ fi
if [ -n "$PT_yum_source" ]; then
yum_source=$PT_yum_source
else
yum_source='http://yum.puppet.com'
if [ "$nightly" = true ]; then
yum_source='http://nightlies.puppet.com/yum'
else
yum_source='http://yum.puppet.com'
fi
fi

if [ -n "$PT_apt_source" ]; then
apt_source=$PT_apt_source
else
apt_source='http://apt.puppet.com'
if [ "$nightly" = true ]; then
apt_source='http://nightlies.puppet.com/apt'
else
apt_source='http://apt.puppet.com'
fi
fi

if [ -n "$PT_mac_source" ]; then
Expand Down Expand Up @@ -440,19 +455,19 @@ case $platform in
rm -f "$gpg_key"
filetype="noarch.rpm"
filename="${collection}-release-sles-${platform_version}.noarch.rpm"
download_url="${yum_source}/${collection}/${filename}"
download_url="${yum_source}/${filename}"
;;
"el")
info "Red hat like platform! Lets get you an RPM..."
filetype="rpm"
filename="${collection}-release-el-${platform_version}.noarch.rpm"
download_url="${yum_source}/${collection}/${filename}"
download_url="${yum_source}/${filename}"
;;
"Fedora")
info "Fedora platform! Lets get the RPM..."
filetype="rpm"
filename="${collection}-release-fedora-${platform_version}.noarch.rpm"
download_url="${yum_source}/${collection}/${filename}"
download_url="${yum_source}/${filename}"
;;
"Debian")
info "Debian platform! Lets get you a DEB..."
Expand Down