You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/03/21 06:53:29 UTC
[geode-native] branch develop updated: GEODE-4899: Use only RHEL 7
(#243)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new a17cf73 GEODE-4899: Use only RHEL 7 (#243)
a17cf73 is described below
commit a17cf73dcee8a9f352e38b7cc6dee5aee8b262d5
Author: M. Oleske <mo...@users.noreply.github.com>
AuthorDate: Tue Mar 20 23:53:27 2018 -0700
GEODE-4899: Use only RHEL 7 (#243)
---
packer/rhel-6-base.json | 49 ----------------------
packer/rhel/install-repos.sh | 8 ++--
packer/test-rhel-6.json | 98 --------------------------------------------
3 files changed, 4 insertions(+), 151 deletions(-)
diff --git a/packer/rhel-6-base.json b/packer/rhel-6-base.json
deleted file mode 100644
index 593a18d..0000000
--- a/packer/rhel-6-base.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "variables":{
- "region":"us-west-2",
- "source_ami":"ami-6fb7450f",
- "source_image_name":"X.vmx",
- "image_name":"rhel-6-base"
- },
- "builders":[
- {
- "type":"amazon-ebs",
- "instance_type":"t2.micro",
- "ami_name":"native-{{user `version`}}-{{user `image_name`}} {{timestamp}}",
- "access_key":"{{user `aws_access_key`}}",
- "secret_key":"{{user `aws_secret_key`}}",
- "region":"{{user `region`}}",
- "source_ami":"{{user `source_ami`}}",
- "subnet_id":"{{user `subnet_id`}}",
- "vpc_id":"{{user `vpc_id`}}",
- "tags":{
- "team":"native",
- "version":"{{user `version`}}",
- "source_ami":"{{user `source_ami`}}"
- },
- "ssh_username":"ec2-user",
- "ssh_pty":true
- }
- ],
- "provisioners":[
- {
- "type":"shell",
- "script":"rhel/wait-for-cloud-init.sh"
- },
- {
- "type":"shell",
- "execute_command":"{{.Vars}} sudo -E -S bash '{{.Path}}'",
- "scripts":[
- "rhel/update.sh"
- ]
- },
- {
- "type":"shell",
- "execute_command":"{{.Vars}} sudo -E -S bash '{{.Path}}'",
- "scripts":[
- "rhel/cleanup.sh",
- "rhel/zerodisk.sh"
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/packer/rhel/install-repos.sh b/packer/rhel/install-repos.sh
index 9c674bc..c4e6273 100644
--- a/packer/rhel/install-repos.sh
+++ b/packer/rhel/install-repos.sh
@@ -6,9 +6,9 @@
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,6 +17,6 @@
set -x -e -o pipefail
-yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
-yum install -y https://rhel6.iuscommunity.org/ius-release.rpm
+yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+yum install -y https://rhel7.iuscommunity.org/ius-release.rpm
diff --git a/packer/test-rhel-6.json b/packer/test-rhel-6.json
deleted file mode 100644
index 647559c..0000000
--- a/packer/test-rhel-6.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
- "variables":{
- "region":"us-west-2",
- "source_ami":"",
- "source_image_name":"X.vmx",
- "image_name":"test-rhel-6"
- },
- "builders":[
- {
- "type":"amazon-ebs",
- "instance_type":"t2.micro",
- "ami_name":"native-{{user `version`}}-{{user `image_name`}} {{timestamp}}",
- "access_key":"{{user `aws_access_key`}}",
- "secret_key":"{{user `aws_secret_key`}}",
- "region":"{{user `region`}}",
- "source_ami":"{{user `source_ami`}}",
- "subnet_id":"{{user `subnet_id`}}",
- "vpc_id":"{{user `vpc_id`}}",
- "tags":{
- "team":"native",
- "version":"{{user `version`}}",
- "source_ami":"{{user `source_ami`}}"
- },
- "ssh_username":"ec2-user",
- "ssh_pty":true
- }
- ],
- "provisioners":[
- {
- "type":"shell",
- "script":"rhel/wait-for-cloud-init.sh"
- },
- {
- "type":"shell",
- "execute_command":"{{.Vars}} sudo -E -S bash '{{.Path}}'",
- "scripts":[
- "rhel/update.sh"
- ]
- },
- {
- "type":"file",
- "source":"rhel/files",
- "destination":"/tmp"
- },
- {
- "type":"shell",
- "execute_command":"{{.Vars}} sudo -E -S bash '{{.Path}}'",
- "inline":[
- "cp -rv /tmp/files/* /",
- "rm -rf /tmp/files",
- "chmod +x /etc/init-user.sh"
- ]
- },
- {
- "type":"file",
- "source":"rhel/init-hosts.rc.local",
- "destination":"/tmp/init-hosts.rc.local"
- },
- {
- "type":"shell",
- "execute_command":"{{.Vars}} sudo -E -S bash '{{.Path}}'",
- "inline":[
- "cat /tmp/init-hosts.rc.local >> /etc/rc.local"
- ]
- },
- {
- "type":"shell",
- "execute_command":"{{.Vars}} sudo -E -S bash '{{.Path}}'",
- "scripts":[
- "rhel/disable-selinux.sh",
- "rhel/add-user-build.sh",
- "rhel/install-repos.sh",
- "rhel/install-jdk-1.8.sh",
- "rhel/install-cmake.sh"
- ]
- },
- {
- "type":"file",
- "source":"{{user `gemfire_archive`}}",
- "destination":"gemfire.tar.gz"
- },
- {
- "type":"shell",
- "execute_command":"{{.Vars}} sudo -E -S bash '{{.Path}}'",
- "scripts":[
- "rhel/install-gemfire.sh"
- ]
- },
- {
- "type":"shell",
- "execute_command":"{{.Vars}} sudo -E -S bash '{{.Path}}'",
- "scripts":[
- "rhel/cleanup.sh",
- "rhel/zerodisk.sh"
- ]
- }
- ]
-}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
jbarrett@apache.org.