juju-core

Merge lp:~thumper/juju-core/arm64-identification into lp:~go-bot/juju-core/trunk

  1. arm64-identification
  2. Merge into trunk
Proposed by Tim Penhey
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 2369
Proposed branch: lp:~thumper/juju-core/arm64-identification
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 133 lines (+11/-10)
9 files modified
cmd/plugins/juju-metadata/validatetoolsmetadata.go (+1/-1)
constraints/constraints.go (+1/-1)
environs/imagemetadata/simplestreams.go (+1/-1)
environs/manual/init.go (+1/-0)
environs/tools/tools.go (+1/-1)
instance/instance.go (+1/-1)
provider/ec2/ec2.go (+2/-2)
provider/openstack/provider.go (+2/-2)
scripts/release-public-tools/release-public-tools.sh (+1/-1)
To merge this branch: bzr merge lp:~thumper/juju-core/arm64-identification
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+208721@code.launchpad.net

Commit message

Identify the arm64 architecture.

Created from patches on lp bug 1276909.

https://codereview.appspot.com/69850043/

Description of the change

Identify the arm64 architecture.

Created from patches on lp bug 1276909.

https://codereview.appspot.com/69850043/

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :
Download full text (5.8 KiB)

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 "amd6...

Read more...

Revision history for this message
Dave Cheney (dave-cheney) wrote :

On 2014/02/28 03:24:15, thumper wrote:
> Please take a look.

LGTM. Does it give you hives that those constants are repeated over and
over again ?

https://codereview.appspot.com/69850043/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmd/plugins/juju-metadata/validatetoolsmetadata.go'
2--- cmd/plugins/juju-metadata/validatetoolsmetadata.go 2014-02-13 02:46:58 +0000
3+++ cmd/plugins/juju-metadata/validatetoolsmetadata.go 2014-02-28 03:22:15 +0000
4@@ -160,7 +160,7 @@
5 return err
6 }
7 params = &simplestreams.MetadataLookupParams{
8- Architectures: []string{"amd64", "arm", "i386"},
9+ Architectures: []string{"amd64", "arm", "i386", "arm64"},
10 }
11 }
12 } else {
13
14=== modified file 'constraints/constraints.go'
15--- constraints/constraints.go 2014-02-03 14:31:54 +0000
16+++ constraints/constraints.go 2014-02-28 03:22:15 +0000
17@@ -281,7 +281,7 @@
18 }
19 switch str {
20 case "":
21- case "amd64", "i386", "arm":
22+ case "amd64", "i386", "arm", "arm64":
23 default:
24 return fmt.Errorf("%q not recognized", str)
25 }
26
27=== modified file 'environs/imagemetadata/simplestreams.go'
28--- environs/imagemetadata/simplestreams.go 2014-01-29 06:45:16 +0000
29+++ environs/imagemetadata/simplestreams.go 2014-02-28 03:22:15 +0000
30@@ -100,7 +100,7 @@
31 params.Series = simplestreams.SupportedSeries()
32 }
33 if len(params.Arches) == 0 {
34- params.Arches = []string{"amd64", "i386", "arm"}
35+ params.Arches = []string{"amd64", "i386", "arm", "arm64"}
36 }
37 return &ImageConstraint{LookupParams: params}
38 }
39
40=== modified file 'environs/manual/init.go'
41--- environs/manual/init.go 2014-01-13 06:25:28 +0000
42+++ environs/manual/init.go 2014-02-28 03:22:15 +0000
43@@ -128,6 +128,7 @@
44 {regexp.MustCompile("amd64|x86_64"), "amd64"},
45 {regexp.MustCompile("i[3-9]86"), "i386"},
46 {regexp.MustCompile("armv.*"), "arm"},
47+ {regexp.MustCompile("aarch64"), "arm64"},
48 }
49
50 const detectionScript = `#!/bin/bash
51
52=== modified file 'environs/tools/tools.go'
53--- environs/tools/tools.go 2014-01-28 04:58:43 +0000
54+++ environs/tools/tools.go 2014-02-28 03:22:15 +0000
55@@ -42,7 +42,7 @@
56 toolsConstraint.Arches = []string{filter.Arch}
57 } else {
58 logger.Debugf("no architecture specified when finding tools, looking for any")
59- toolsConstraint.Arches = []string{"amd64", "i386", "arm"}
60+ toolsConstraint.Arches = []string{"amd64", "i386", "arm", "arm64"}
61 }
62 // The old tools search allowed finding tools without needing to specify a series.
63 // The simplestreams metadata is keyed off series, so series must be specified in
64
65=== modified file 'instance/instance.go'
66--- instance/instance.go 2014-01-20 17:18:13 +0000
67+++ instance/instance.go 2014-02-28 03:22:15 +0000
68@@ -175,7 +175,7 @@
69 }
70 switch str {
71 case "":
72- case "amd64", "i386", "arm":
73+ case "amd64", "i386", "arm", "arm64":
74 default:
75 return fmt.Errorf("%q not recognized", str)
76 }
77
78=== modified file 'provider/ec2/ec2.go'
79--- provider/ec2/ec2.go 2014-02-20 08:23:40 +0000
80+++ provider/ec2/ec2.go 2014-02-28 03:22:15 +0000
81@@ -236,7 +236,7 @@
82 return &simplestreams.MetadataLookupParams{
83 Region: region,
84 Endpoint: ec2Region.EC2Endpoint,
85- Architectures: []string{"amd64", "i386", "arm"},
86+ Architectures: []string{"amd64", "i386", "arm", "arm64"},
87 }, nil
88 }
89
90@@ -338,7 +338,7 @@
91 Series: e.ecfg().DefaultSeries(),
92 Region: region,
93 Endpoint: ec2Region.EC2Endpoint,
94- Architectures: []string{"amd64", "i386", "arm"},
95+ Architectures: []string{"amd64", "i386", "arm", "arm64"},
96 }, nil
97 }
98
99
100=== modified file 'provider/openstack/provider.go'
101--- provider/openstack/provider.go 2014-02-20 08:23:40 +0000
102+++ provider/openstack/provider.go 2014-02-28 03:22:15 +0000
103@@ -204,7 +204,7 @@
104 }
105 return &simplestreams.MetadataLookupParams{
106 Region: region,
107- Architectures: []string{"amd64", "arm"},
108+ Architectures: []string{"amd64", "arm", "arm64"},
109 }, nil
110 }
111
112@@ -1196,7 +1196,7 @@
113 Series: e.ecfg().DefaultSeries(),
114 Region: region,
115 Endpoint: e.ecfg().authURL(),
116- Architectures: []string{"amd64", "arm"},
117+ Architectures: []string{"amd64", "arm", "arm64"},
118 }, nil
119 }
120
121
122=== modified file 'scripts/release-public-tools/release-public-tools.sh'
123--- scripts/release-public-tools/release-public-tools.sh 2013-10-03 00:23:38 +0000
124+++ scripts/release-public-tools/release-public-tools.sh 2014-02-28 03:22:15 +0000
125@@ -105,7 +105,7 @@
126 control_file=$1
127 arch=$(sed -n 's/^Architecture: \([a-z]\+\)/\1/p' $control_file)
128 case "${arch}" in
129- "amd64" | "i386" | "armel" | "armhf" )
130+ "amd64" | "i386" | "armel" | "armhf" | "arm64" )
131 ;;
132 *)
133 echo "Invalid arch: $arch"

Subscribers

People subscribed via source and target branches

to status/vote changes: