Reviewers: mp+208721_code.launchpad.net,

Message:
Please take a look.

Description:
Identify the arm64 architecture.

Created from patches on lp bug 1276909.

https://code.launchpad.net/~thumper/juju-core/arm64-identification/+merge/208721

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/69850043/

Affected files (+13, -10 lines):
   A [revision details]
   M cmd/plugins/juju-metadata/validatetoolsmetadata.go
   M constraints/constraints.go
   M environs/imagemetadata/simplestreams.go
   M environs/manual/init.go
   M environs/tools/tools.go
   M instance/instance.go
   M provider/ec2/ec2.go
   M provider/openstack/provider.go
   M scripts/release-public-tools/release-public-tools.sh


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140226173959-t6oiwcyvbk1e5r4i
+New revision: <email address hidden>

Index: constraints/constraints.go
=== modified file 'constraints/constraints.go'
--- constraints/constraints.go	2014-02-03 14:31:54 +0000
+++ constraints/constraints.go	2014-02-28 03:05:47 +0000
@@ -281,7 +281,7 @@
  	}
  	switch str {
  	case "":
-	case "amd64", "i386", "arm":
+	case "amd64", "i386", "arm", "arm64":
  	default:
  		return fmt.Errorf("%q not recognized", str)
  	}


Index: environs/imagemetadata/simplestreams.go
=== modified file 'environs/imagemetadata/simplestreams.go'
--- environs/imagemetadata/simplestreams.go	2014-01-29 06:45:16 +0000
+++ environs/imagemetadata/simplestreams.go	2014-02-28 03:05:47 +0000
@@ -100,7 +100,7 @@
  		params.Series = simplestreams.SupportedSeries()
  	}
  	if len(params.Arches) == 0 {
-		params.Arches = []string{"amd64", "i386", "arm"}
+		params.Arches = []string{"amd64", "i386", "arm", "arm64"}
  	}
  	return &ImageConstraint{LookupParams: params}
  }


Index: environs/manual/init.go
=== modified file 'environs/manual/init.go'
--- environs/manual/init.go	2014-01-13 06:25:28 +0000
+++ environs/manual/init.go	2014-02-28 03:05:47 +0000
@@ -128,6 +128,7 @@
  	{regexp.MustCompile("amd64|x86_64"), "amd64"},
  	{regexp.MustCompile("i[3-9]86"), "i386"},
  	{regexp.MustCompile("armv.*"), "arm"},
+	{regexp.MustCompile("aarch64"), "arm64"},
  }

  const detectionScript = `#!/bin/bash


Index: cmd/plugins/juju-metadata/validatetoolsmetadata.go
=== modified file 'cmd/plugins/juju-metadata/validatetoolsmetadata.go'
--- cmd/plugins/juju-metadata/validatetoolsmetadata.go	2014-02-13 02:46:58  
+0000
+++ cmd/plugins/juju-metadata/validatetoolsmetadata.go	2014-02-28 03:05:47  
+0000
@@ -160,7 +160,7 @@
  				return err
  			}
  			params = &simplestreams.MetadataLookupParams{
-				Architectures: []string{"amd64", "arm", "i386"},
+				Architectures: []string{"amd64", "arm", "i386", "arm64"},
  			}
  		}
  	} else {


Index: instance/instance.go
=== modified file 'instance/instance.go'
--- instance/instance.go	2014-01-20 17:18:13 +0000
+++ instance/instance.go	2014-02-28 03:05:47 +0000
@@ -175,7 +175,7 @@
  	}
  	switch str {
  	case "":
-	case "amd64", "i386", "arm":
+	case "amd64", "i386", "arm", "arm64":
  	default:
  		return fmt.Errorf("%q not recognized", str)
  	}


Index: environs/tools/tools.go
=== modified file 'environs/tools/tools.go'
--- environs/tools/tools.go	2014-01-28 04:58:43 +0000
+++ environs/tools/tools.go	2014-02-28 03:05:47 +0000
@@ -42,7 +42,7 @@
  		toolsConstraint.Arches = []string{filter.Arch}
  	} else {
  		logger.Debugf("no architecture specified when finding tools, looking for  
any")
-		toolsConstraint.Arches = []string{"amd64", "i386", "arm"}
+		toolsConstraint.Arches = []string{"amd64", "i386", "arm", "arm64"}
  	}
  	// The old tools search allowed finding tools without needing to specify  
a series.
  	// The simplestreams metadata is keyed off series, so series must be  
specified in


Index: provider/ec2/ec2.go
=== modified file 'provider/ec2/ec2.go'
--- provider/ec2/ec2.go	2014-02-20 08:23:40 +0000
+++ provider/ec2/ec2.go	2014-02-28 03:05:47 +0000
@@ -236,7 +236,7 @@
  	return &simplestreams.MetadataLookupParams{
  		Region:        region,
  		Endpoint:      ec2Region.EC2Endpoint,
-		Architectures: []string{"amd64", "i386", "arm"},
+		Architectures: []string{"amd64", "i386", "arm", "arm64"},
  	}, nil
  }

@@ -338,7 +338,7 @@
  		Series:        e.ecfg().DefaultSeries(),
  		Region:        region,
  		Endpoint:      ec2Region.EC2Endpoint,
-		Architectures: []string{"amd64", "i386", "arm"},
+		Architectures: []string{"amd64", "i386", "arm", "arm64"},
  	}, nil
  }



Index: provider/openstack/provider.go
=== modified file 'provider/openstack/provider.go'
--- provider/openstack/provider.go	2014-02-20 08:23:40 +0000
+++ provider/openstack/provider.go	2014-02-28 03:05:47 +0000
@@ -204,7 +204,7 @@
  	}
  	return &simplestreams.MetadataLookupParams{
  		Region:        region,
-		Architectures: []string{"amd64", "arm"},
+		Architectures: []string{"amd64", "arm", "arm64"},
  	}, nil
  }

@@ -1196,7 +1196,7 @@
  		Series:        e.ecfg().DefaultSeries(),
  		Region:        region,
  		Endpoint:      e.ecfg().authURL(),
-		Architectures: []string{"amd64", "arm"},
+		Architectures: []string{"amd64", "arm", "arm64"},
  	}, nil
  }



Index: scripts/release-public-tools/release-public-tools.sh
=== modified file 'scripts/release-public-tools/release-public-tools.sh'
--- scripts/release-public-tools/release-public-tools.sh	2013-10-03  
00:23:38 +0000
+++ scripts/release-public-tools/release-public-tools.sh	2014-02-28  
03:05:47 +0000
@@ -105,7 +105,7 @@
      control_file=$1
      arch=$(sed -n 's/^Architecture: \([a-z]\+\)/\1/p' $control_file)
      case "${arch}" in
-	    "amd64" | "i386" | "armel" | "armhf" )
+	    "amd64" | "i386" | "armel" | "armhf" | "arm64" )
  		    ;;
  	    *)
  		    echo "Invalid arch: $arch"