Merge pull request #2461 from influxdata/rem-386

chore: remove support for 386

.circleci/config.yml

@@ -24,7 +24,7 @@ jobs:
       build:
             docker:
                   - image: nathanielc/docker-client
-            parallelism: 3
+            parallelism: 2
             working_directory: ~/kapacitor
             steps:
                   - checkout

CHANGELOG.md

@@ -14,6 +14,7 @@
 - [#2441](https://github.com/influxdata/kapacitor/pull/2441): Preallocate GroupIDs for increased performance by reducing allocations.
 - [#2456](https://github.com/influxdata/kapacitor/pull/2456): Gzip data by default that is sent to influxdb.
 - [#2454](https://github.com/influxdata/kapacitor/pull/2454): Add PrimaryProperty and SecondaryProperty methods to BigPanda AlertNode.
+- [#2461](https://github.com/influxdata/kapacitor/pull/2461): BREAKING: we are forced to remove support for 386 builds as go doesn't support them anymore.
 
 ## v1.5.7 [2020-10-27]
 

build.py

@@ -92,9 +92,9 @@
 }
 
 supported_builds = {
-    'darwin': [ "amd64", "i386" ],
-    'linux': [ "amd64", "i386", "armhf", "arm64", "armel", "static_i386", "static_amd64" ],
-    'windows': [ "amd64", "i386" ]
+    'darwin': [ "amd64" ],
+    'linux': [ "amd64", "armhf", "arm64", "armel", "static_amd64" ],
+    'windows': [ "amd64" ]
 }
 
 supported_packages = {
@@ -382,8 +382,6 @@ def get_system_arch():
     arch = os.uname()[4]
     if arch == "x86_64":
         arch = "amd64"
-    elif arch == "386":
-        arch = "i386"
     elif arch == "aarch64":
         arch = "arm64"
     elif 'arm' in arch:
@@ -531,9 +529,7 @@ def build(version=None,
 
         # Handle variations in architecture output
         fullarch = arch
-        if arch == "i386" or arch == "i686":
-            arch = "386"
-        elif arch == "aarch64" or arch == "arm64":
+        if arch == "aarch64" or arch == "arm64":
             arch = "arm64"
         elif "arm" in arch:
             arch = "arm"
@@ -913,7 +909,7 @@ def main(args):
                         type=str,
                         help='Name to use for package name (when package is specified)')
     parser.add_argument('--arch',
-                        metavar='<amd64|i386|armhf|arm64|armel|all>',
+                        metavar='<amd64|armhf|arm64|armel|all>',
                         type=str,
                         default=get_system_arch(),
                         help='Target architecture for build output')

test.sh

@@ -43,7 +43,7 @@ then
 fi
 
 # Update this value if you add a new test environment.
-ENV_COUNT=3
+ENV_COUNT=2
 
 # Default return code 0
 rc=0
@@ -118,11 +118,6 @@ case $ENVIRONMENT_INDEX in
         run_test_docker Dockerfile_build_ubuntu64 test_64bit_race --test --generate $no_uncommitted_arg --race
         rc=$?
         ;;
-    2)
-        # 32 bit tests
-        run_test_docker Dockerfile_build_ubuntu32 test_32bit --test --generate $no_uncommitted_arg --arch=i386
-        rc=$?
-        ;;
     "count")
         echo $ENV_COUNT
         ;;