diff options
| -rw-r--r-- | packer/provision/basebuild.sh | 6 | ||||
| -rw-r--r-- | packer/provision/baseline.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 057c98dea..aba8b19ce 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -16,10 +16,10 @@ rh_systems() { yum install -y firefox python-tox xmlstarlet xvfb crudini maven # Install chrome to support ChromeDriver - cat <<EOF > /etc/yum.repos.d/google-chrome.repo + cat << EOF > /etc/yum.repos.d/google-chrome.repo [google-chrome] -name=google-chrome -baseurl=http://dl.google.com/linux/chrome/rpm/stable/$basearch +name=google-chrome - \$basearch +baseurl=http://dl.google.com/linux/chrome/rpm/stable/\$basearch enabled=1 gpgcheck=1 gpgkey=https://dl-ssl.google.com/linux/linux_signing_key.pub diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index d97f0e2ed..cae373e60 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -52,7 +52,7 @@ rh_systems() { # separate group installs from package installs since a non-existing # group with dnf based systems (F21+) will fail the install if such # a group does not exist - yum install -y unzip xz puppet git git-review perl-XML-XPath wget make + yum install -y unzip xz puppet git git-review perl-XML-XPath wget make npm # All of our systems require Java (because of Jenkins) # Install all versions of the OpenJDK devel but force 1.7.0 to be the @@ -121,7 +121,7 @@ EOF # add in stuff we know we need echo "---> Installing base packages" - apt-get install unzip xz-utils puppet git git-review libxml-xpath-perl make wget + apt-get install -y unzip xz-utils puppet git git-review libxml-xpath-perl make wget npm # install Java 7 echo "---> Configuring OpenJDK" |