From 65371d82fbb6a26081edf7399c649255e83e211f Mon Sep 17 00:00:00 2001
From: "docmerlin (j. Emrys Landivar)" <landivar@gmail.com>
Date: Wed, 6 Jan 2021 09:40:09 -0600
Subject: [PATCH] chore: remove support for 386

---
 .circleci/config.yml      |  2 +-
 CHANGELOG.md              |  1 +
 Dockerfile_build_ubuntu32 | 58 ---------------------------------------
 build.py                  | 14 ++++------
 test.sh                   |  7 +----
 5 files changed, 8 insertions(+), 74 deletions(-)
 delete mode 100644 Dockerfile_build_ubuntu32

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ad70da33..5f2f3d5b4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,7 +24,7 @@ jobs:
       build:
             docker:
                   - image: nathanielc/docker-client
-            parallelism: 3
+            parallelism: 2
             working_directory: ~/kapacitor
             steps:
                   - checkout
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f784ba23a..d119ff84d 100644
--- a/CHANGELOG.md
+++ b/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]
 
diff --git a/Dockerfile_build_ubuntu32 b/Dockerfile_build_ubuntu32
deleted file mode 100644
index 735742f58..000000000
--- a/Dockerfile_build_ubuntu32
+++ /dev/null
@@ -1,58 +0,0 @@
-FROM 32bit/ubuntu:16.04
-
-# This dockerfile capabable  of the the minumum required
-# to run the tests and nothing else.
-
-MAINTAINER support@influxdb.com
-
-RUN apt-get -qq update && apt-get -qq install -y \
-    wget \
-    unzip \
-    git \
-    mercurial \
-    build-essential \
-    autoconf \
-    automake \
-    libtool \
-    python \
-    python-setuptools \
-    python3 \
-    python3-setuptools \
-    zip \
-    curl
-
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-
-# Install protobuf3 protoc binary
-
-# Install protobuf3 protoc binary
-ENV PROTO_VERSION 3.11.1
-RUN wget -q https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/protoc-${PROTO_VERSION}-linux-x86_32.zip\
-    && unzip -j protoc-${PROTO_VERSION}-linux-x86_32.zip bin/protoc -d /bin \
-    rm protoc-${PROTO_VERSION}-linux-x86_64.zip
-
-# Install protobuf3 python library
-RUN wget -q https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/protobuf-python-${PROTO_VERSION}.tar.gz \
-    && tar -xf protobuf-python-${PROTO_VERSION}.tar.gz \
-    && cd /protobuf-${PROTO_VERSION}/python \
-    && python2 setup.py install \
-    && python3 setup.py install \
-    && rm -rf /protobuf-${PROTO_VERSION} protobuf-python-${PROTO_VERSION}.tar.gz
-
-# Install go
-ENV GOPATH /root/go
-ENV GO_VERSION 1.15.5
-ENV GO_ARCH 386
-RUN wget -q https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
-   tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \
-   rm /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz
-ENV PATH /usr/local/go/bin:$PATH
-
-ENV PROJECT_DIR $GOPATH/src/github.com/influxdata/kapacitor
-ENV PATH $GOPATH/bin:$PATH
-RUN mkdir -p $PROJECT_DIR
-WORKDIR $PROJECT_DIR
-
-VOLUME $PROJECT_DIR
-
-ENTRYPOINT [ "/root/go/src/github.com/influxdata/kapacitor/build.py" ]
diff --git a/build.py b/build.py
index e77960732..4c97ac344 100755
--- a/build.py
+++ b/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')
diff --git a/test.sh b/test.sh
index 00ccaea81..6d29edb32 100755
--- a/test.sh
+++ b/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
         ;;