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 0fba5ce GEODE-3455: Update Solaris build images.
0fba5ce is described below
commit 0fba5cee59d5d53eaab6cc9396eab45df4b8d79c
Author: Jacob Barrett <[email protected]>
AuthorDate: Wed Aug 2 12:32:34 2017 -0700
GEODE-3455: Update Solaris build images.
- Fixes Solaris SPARC image.
- Addes developer images.
---
packer/build-solaris-sparc.json | 10 +++++----
packer/build-solaris-x86.json | 7 +++---
packer/dev-solaris-sparc.json | 38 +++++++++++++++++++++++++++++++++
packer/dev-solaris-x86.json | 38 +++++++++++++++++++++++++++++++++
packer/solaris/install-cmake.sh | 8 ++++---
packer/solaris/install-solarisstudio.sh | 1 -
6 files changed, 91 insertions(+), 11 deletions(-)
diff --git a/packer/build-solaris-sparc.json b/packer/build-solaris-sparc.json
index 34aea96..0ce5eec 100644
--- a/packer/build-solaris-sparc.json
+++ b/packer/build-solaris-sparc.json
@@ -1,8 +1,9 @@
{
"variables":{
"image_name":"build-solaris-sparc",
- "openstack_source_image":"7e1e66f1-8256-4e29-a314-ee7f54b2f720",
- "vmware_source_image_name":"X.vmx",
+ "openstack_source_image":"",
+ "openstack_flavor":"Oracle Solaris non-global zone - tiny",
+ "vmware_source_image_name":"",
"gemfire_archive":"gemfire.tar.gz",
"pkg_oracle_com_certificate":"pkg.oracle.com.certificate.pem",
"pkg_oracle_com_key":"pkg.oracle.com.key.pem"
@@ -18,7 +19,7 @@
"ssh_username":"root",
"image_name":"native-{{user `version`}}-{{user `image_name`}}
{{timestamp}}",
"source_image":"{{user `openstack_source_image`}}",
- "flavor":"Oracle Solaris non-global zone - tiny",
+ "flavor":"{{user `openstack_flavor`}}",
"insecure":"true"
}
],
@@ -38,7 +39,8 @@
"scripts":[
"solaris/install-opencsw.sh",
"solaris/install-build-tools.sh",
- "solaris/install-solarisstudio.sh"
+ "solaris/install-solarisstudio.sh",
+ "solaris/install-cmake.sh"
]
},
{
diff --git a/packer/build-solaris-x86.json b/packer/build-solaris-x86.json
index b01519e..6a55c82 100644
--- a/packer/build-solaris-x86.json
+++ b/packer/build-solaris-x86.json
@@ -1,8 +1,9 @@
{
"variables":{
"image_name":"build-solaris-x86",
- "openstack_source_image":"c0df7ff9-fc8f-4220-ac1f-fd24924dfe7a",
- "vmware_source_image_name":"X.vmx",
+ "openstack_source_image":"",
+ "openstack_flavor":"Oracle Solaris non-global zone - tiny",
+ "vmware_source_image_name":"",
"gemfire_archive":"gemfire.tar.gz",
"pkg_oracle_com_certificate":"pkg.oracle.com.certificate.pem",
"pkg_oracle_com_key":"pkg.oracle.com.key.pem"
@@ -18,7 +19,7 @@
"ssh_username":"root",
"image_name":"native-{{user `version`}}-{{user `image_name`}}
{{timestamp}}",
"source_image":"{{user `openstack_source_image`}}",
- "flavor":"Oracle Solaris non-global zone - tiny",
+ "flavor":"{{user `openstack_flavor`}}",
"insecure":"true"
}
],
diff --git a/packer/dev-solaris-sparc.json b/packer/dev-solaris-sparc.json
new file mode 100644
index 0000000..180e8e3
--- /dev/null
+++ b/packer/dev-solaris-sparc.json
@@ -0,0 +1,38 @@
+{
+ "variables":{
+ "image_name":"dev-solaris-sparc",
+ "openstack_source_image":"",
+ "openstack_flavor":"Oracle Solaris non-global zone - tiny",
+ "vmware_source_image_name":""
+ },
+ "builders":[
+ {
+ "type":"openstack",
+ "identity_endpoint":"{{user `openstack_identity_endpoint`}}",
+ "tenant_name":"{{user `openstack_tenant_name`}}",
+ "username":"{{user `openstack_username`}}",
+ "password":"{{user `openstack_password`}}",
+ "region":"{{user `openstack_region`}}",
+ "ssh_username":"root",
+ "image_name":"native-{{user `version`}}-{{user `image_name`}}
{{timestamp}}",
+ "source_image":"{{user `openstack_source_image`}}",
+ "flavor":"{{user `openstack_flavor`}}",
+ "insecure":"true"
+ }
+ ],
+ "provisioners":[
+ {
+ "type":"shell",
+ "inline":[
+ "/opt/csw/bin/pkgutil -i -y ccache"
+ ]
+ },
+ {
+ "type":"shell",
+ "scripts":[
+ "solaris/update.sh",
+ "solaris/cleanup.sh"
+ ]
+ }
+ ]
+}
diff --git a/packer/dev-solaris-x86.json b/packer/dev-solaris-x86.json
new file mode 100644
index 0000000..783945e
--- /dev/null
+++ b/packer/dev-solaris-x86.json
@@ -0,0 +1,38 @@
+{
+ "variables":{
+ "image_name":"dev-solaris-x86",
+ "openstack_source_image":"",
+ "openstack_flavor":"Oracle Solaris non-global zone - tiny",
+ "vmware_source_image_name":""
+ },
+ "builders":[
+ {
+ "type":"openstack",
+ "identity_endpoint":"{{user `openstack_identity_endpoint`}}",
+ "tenant_name":"{{user `openstack_tenant_name`}}",
+ "username":"{{user `openstack_username`}}",
+ "password":"{{user `openstack_password`}}",
+ "region":"{{user `openstack_region`}}",
+ "ssh_username":"root",
+ "image_name":"native-{{user `version`}}-{{user `image_name`}}
{{timestamp}}",
+ "source_image":"{{user `openstack_source_image`}}",
+ "flavor":"{{user `openstack_flavor`}}",
+ "insecure":"true"
+ }
+ ],
+ "provisioners":[
+ {
+ "type":"shell",
+ "inline":[
+ "/opt/csw/bin/pkgutil -i -y ccache"
+ ]
+ },
+ {
+ "type":"shell",
+ "scripts":[
+ "solaris/update.sh",
+ "solaris/cleanup.sh"
+ ]
+ }
+ ]
+}
diff --git a/packer/solaris/install-cmake.sh b/packer/solaris/install-cmake.sh
index 402ea11..d366cf6 100644
--- a/packer/solaris/install-cmake.sh
+++ b/packer/solaris/install-cmake.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,7 +17,9 @@
set -x -e -o pipefail
-NCPU=4
+source ~/.bashrc
+
+NCPU=2
pushd `mktemp -d`
wget -O - https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz | \
diff --git a/packer/solaris/install-solarisstudio.sh
b/packer/solaris/install-solarisstudio.sh
index ce23cc5..faa6b0c 100644
--- a/packer/solaris/install-solarisstudio.sh
+++ b/packer/solaris/install-solarisstudio.sh
@@ -19,7 +19,6 @@ set -e
pkg change-facet
facet.version-lock.consolidation/sunpro/sunpro-incorporation=false
pkg update sunpro-incorporation || true
-pkg change-facet
facet.version-lock.consolidation/sunpro/sunpro-incorporation=true
pkg set-publisher \
-k /var/pkg/ssl/pkg.oracle.com.key.pem \
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
