From 7a300e64dddc158c6941e6bfd3b6fa66233a7561 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sun, 4 Oct 2020 13:17:48 +0200
Subject: Drop OPNFV arm64 support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Armband left OPNFV.
Functest still supports arm and arm64 via .travis-ci.

Change-Id: Ie0c7de20182fa91231760ad29c3b38c8ca8c9779
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/functest-docker.yaml | 39 ++-------------------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

(limited to 'jjb/functest/functest-docker.yaml')

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 95a7a197f..f4714a9fd 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -31,8 +31,6 @@
     arch_tag:
       - 'amd64':
           slave_label: 'lf-build2'
-      - 'arm64':
-          slave_label: 'opnfv-build-ubuntu-arm'
 
     # yamllint disable rule:key-duplicates
     image:
@@ -128,8 +126,6 @@
           projects:
             - name: 'functest-core-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-core-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish functest-core manifests'
           execution-type: PARALLEL
@@ -142,8 +138,6 @@
           projects:
             - name: 'functest-tempest-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-tempest-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish functest-tempest manifests'
           execution-type: PARALLEL
@@ -157,24 +151,14 @@
           projects:
             - name: 'functest-healthcheck-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-healthcheck-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-smoke-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-smoke-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-benchmarking-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-benchmarking-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-vnf-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-vnf-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-features-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-features-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish all manifests'
           condition: SUCCESSFUL
@@ -197,12 +181,8 @@
           projects:
             - name: 'functest-smoke-cntt-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-smoke-cntt-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-benchmarking-cntt-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-benchmarking-cntt-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish all cntt manifests'
           condition: SUCCESSFUL
@@ -215,7 +195,6 @@
 
     publishers:
       - 'functest-amd64-recipients'
-      - 'functest-arm64-recipients'
 
 - job-template:
     name: 'functest-{image}-docker-build-{arch_tag}-{stream}'
@@ -231,12 +210,7 @@
     builders:
       - shell: |
           #!/bin/bash -ex
-          case "{arch_tag}" in
-          "arm64")
-              sudo amd64_dirs= arm64_dirs=docker/{image} arm_dirs= bash ./build.sh ;;
-          *)
-              sudo amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh ;;
-          esac
+          sudo amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh ;;
           exit $?
 
 - job-template:
@@ -278,7 +252,7 @@
               tag="{stream}" ;;
           esac
           sudo manifest-tool push from-args \
-              --platforms linux/amd64,linux/arm64 \
+              --platforms linux/amd64 \
               --template $REPO/functest-{image}:ARCH-$tag \
               --target $REPO/functest-{image}:$tag
           exit $?
@@ -330,15 +304,6 @@
           description: "Repository name for functest images"
 
 # publisher macros
-- publisher:
-    name: 'functest-arm64-recipients'
-    publishers:
-      - email:
-          recipients: >
-            cristina.pauna@enea.com
-            alexandru.avadanii@enea.com
-            delia.popescu@enea.com
-
 - publisher:
     name: 'functest-amd64-recipients'
     publishers:
-- 
cgit 1.2.3-korg