docker builds: allow use of arm64 host

M6G host can do both

Change-Id: Idda6bb03eafc332803be09400873c941f5676a00
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>

2 files changed, 1 insertions, 117 deletions

diff --git a/ci-dockerfiles-deployment/builders.sh b/ci-dockerfiles-deployment/builders.sh
index 7bb3afaaba..958910dcdd 100644
--- a/ci-dockerfiles-deployment/builders.sh
+++ b/ci-dockerfiles-deployment/builders.sh
@@ -62,7 +62,7 @@ for image in ${update_images}; do
     "skip:"*)
       echo "Skipping: don't need to build ${image} on branch ${GERRIT_BRANCH}"
       ;;
-    "no:amd64:amd64"|"no:amd64:i386"|"no:arm64:arm64"|"no:armhf:armhf")
+    "no:amd64:amd64"|"no:amd64:i386"|"no:arm64:arm64"|"no:armhf:armhf"|"no:arm64:armhf")
       echo "=== Start build: ${image} ==="
       ./build.sh || echo "=== FAIL: ${image} ===" >> ${WORKSPACE}/log
       ;;
diff --git a/stretch-armhf-rootfs.yaml b/stretch-armhf-rootfs.yaml
deleted file mode 100644
index be9aa95752..0000000000
--- a/stretch-armhf-rootfs.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
-- job:
-    name: stretch-armhf-rootfs
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: codename
-            default: 'stretch'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Debian armhf rootfs (Stretch)'
-    scm:
-        - git:
-            url: https://git.linaro.org/ci/ubuntu-build-service.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            clean:
-                after: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-armhf
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - alip
-                - developer
-                - installer
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-        - timeout:
-            timeout: 120
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends cpio debootstrap live-build python-requests uuid-runtime
-            sudo dpkg -i --force-all packages/live-build_3.0.5-1linaro1_all.deb
-
-            dpkg -s qemu-user-static |grep '^Version'
-            dpkg -s live-build |grep '^Version'
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=8G tmpfs builddir
-            cp -a ${codename}-armhf-${rootfs} builddir/
-            cd builddir/${codename}-armhf-${rootfs}
-            ./configure
-            make
-
-            cd ${WORKSPACE}
-            sudo rm -rf out && mkdir out
-            sudo mv builddir/${codename}-armhf-${rootfs}/linaro-${codename}-* out
-
-            # Build information
-            cat > out/HEADER.textile << EOF
-
-            h4. Build description ( $JOB_NAME )
-
-            * Job URL: "$JOB_URL":$JOB_URL
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Commit: "$GIT_COMMIT":$GIT_URL/commit/?id=$GIT_COMMIT
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python3 ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out debian/images/${codename}/${rootfs}-armhf/${BUILD_NUMBER}
-    publishers:
-        - groovy-postbuild:
-            script: |
-                def build_number = manager.build.number
-                def codename = manager.build.buildVariables.get('codename')
-                def rootfs = manager.build.buildVariables.get('rootfs')
-                def url = "http://snapshots.linaro.org/debian/images/${codename}/${rootfs}-armhf/${build_number}/"
-                def desc = "&nbsp;<a href='${url}'>Build location</a>"
-
-                if (manager.build.result == hudson.model.Result.SUCCESS) {
-                  manager.build.setDescription(desc)
-                }
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'