Drop OPNFV arm64 support

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>

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 95a7a19..f4714a9 100644 (file)
--- 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:

diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml
index 323a9c5..274e250 100644 (file)
--- a/jjb/functest/functest-kubernetes-docker.yaml
+++ b/jjb/functest/functest-kubernetes-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:
@@ -109,8 +107,6 @@
           projects:
             - name: 'functest-kubernetes-core-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-kubernetes-core-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish functest-kubernetes-core manifests'
           execution-type: PARALLEL
@@ -123,16 +119,10 @@
           projects:
             - name: 'functest-kubernetes-healthcheck-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-kubernetes-healthcheck-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-kubernetes-cnf-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-kubernetes-cnf-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-kubernetes-security-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-kubernetes-security-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish functest-kubernetes-[healthcheck,cnf,security] manifests'
           execution-type: PARALLEL
@@ -150,8 +140,6 @@
           projects:
             - name: 'functest-kubernetes-smoke-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-kubernetes-smoke-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish functest-kubernetes-smoke manifests'
           condition: SUCCESSFUL
@@ -166,8 +154,6 @@
           projects:
             - name: 'functest-kubernetes-benchmarking-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-kubernetes-benchmarking-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish functest-kubernetes-benchmarking manifests'
           condition: SUCCESSFUL
@@ -178,7 +164,6 @@
 
     publishers:
       - 'functest-kubernetes-amd64-recipients'
-      - 'functest-kubernetes-arm64-recipients'
 
 - job-template:
     name: 'functest-kubernetes-{image}-docker-build-{arch_tag}-{stream}'
@@ -194,12 +179,7 @@
     builders:
       - shell: |
           #!/bin/bash -ex
-          case "{arch_tag}" in
-          "arm64")
-              sudo amd64_dirs= arm_dirs= arm64_dirs=docker/{image} bash ./build.sh ;;
-          *)
-              sudo amd64_dirs=docker/{image} arm_dirs= arm64_dirs= bash ./build.sh ;;
-          esac
+          sudo amd64_dirs=docker/{image} arm_dirs= arm64_dirs= bash ./build.sh ;;
           exit $?
 
 - job-template:
@@ -241,7 +221,7 @@
               tag="{stream}" ;;
           esac
           sudo manifest-tool push from-args \
-              --platforms linux/amd64,linux/arm64 \
+              --platforms linux/amd64 \
               --template $REPO/functest-kubernetes-{image}:ARCH-$tag \
               --target $REPO/functest-kubernetes-{image}:$tag
           exit $?
@@ -293,15 +273,6 @@
           description: "Repository name for functest-kubernetes images"
 
 # publisher macros
-- publisher:
-    name: 'functest-kubernetes-arm64-recipients'
-    publishers:
-      - email:
-          recipients: >
-            cristina.pauna@enea.com
-            alexandru.avadanii@enea.com
-            delia.popescu@enea.com
-
 - publisher:
     name: 'functest-kubernetes-amd64-recipients'
     publishers:

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 5b45e19..263228b 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -26,24 +26,6 @@
       - hunter:
           branch: stable/hunter
           slave: lf-virtual1-1
-      - arm64-latest:
-          branch: master
-          slave: lf-virtual1-6
-      - arm64-leguer:
-          branch: stable/leguer
-          slave: lf-virtual1-5
-      - arm64-kali:
-          branch: stable/kali
-          slave: lf-virtual1-4
-      - arm64-jerma:
-          branch: stable/jerma
-          slave: lf-virtual1-3
-      - arm64-iruya:
-          branch: stable/iruya
-          slave: lf-virtual1-2
-      - arm64-hunter:
-          branch: stable/hunter
-          slave: lf-virtual1-1
 
 - parameter:
     name: functest-kubernetes-slave
@@ -351,10 +333,6 @@
         test: k8s_vims
       - tag: iruya
         test: helm_vims
-      - tag: arm64-iruya
-        test: k8s_vims
-      - tag: arm64-iruya
-        test: helm_vims
     privileged: 'false'
     network: bridge
     jobs:
@@ -535,13 +513,6 @@
     container: golang
     tag: '1.15-alpine3.12'
     slave: master
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
@@ -552,13 +523,6 @@
     container: golang
     tag: '1.15-alpine3.12'
     slave: master
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -568,13 +532,6 @@
     container: functest-kubernetes-core
     ref_arg: BRANCH
     path: docker/core
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -585,13 +542,6 @@
     container: functest-kubernetes-healthcheck
     ref_arg:
     path: docker/healthcheck
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -602,13 +552,6 @@
     container: functest-kubernetes-cnf
     ref_arg: BRANCH
     path: docker/cnf
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -619,13 +562,6 @@
     container: functest-kubernetes-security
     ref_arg: BRANCH
     path: docker/security
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -636,13 +572,6 @@
     container: functest-kubernetes-smoke
     ref_arg:
     path: docker/smoke
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -653,13 +582,6 @@
     container: functest-kubernetes-benchmarking
     ref_arg:
     path: docker/benchmarking
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -909,13 +831,6 @@
 - project:
     name: 'functest-kubernetes-gate'
     <<: *functest-kubernetes-params
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{tag}-check'
       - 'functest-kubernetes-{tag}-gate'

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index bf6995b..70ac9f7 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -32,30 +32,6 @@
           branch: stable/hunter
           slave: lf-virtual6
           dashboard_url: http://172.30.13.91
-      - arm64-latest:
-          branch: master
-          slave: lf-virtual9
-          dashboard_url: http://172.30.13.94
-      - arm64-leguer:
-          branch: stable/leguer
-          slave: lf-virtual9
-          dashboard_url: http://172.30.13.94
-      - arm64-kali:
-          branch: stable/kali
-          slave: lf-pod4-3
-          dashboard_url: http://172.30.12.88
-      - arm64-jerma:
-          branch: stable/jerma
-          slave: lf-pod4
-          dashboard_url: http://172.30.12.83
-      - arm64-iruya:
-          branch: stable/iruya
-          slave: lf-virtual4
-          dashboard_url: http://172.30.13.89
-      - arm64-hunter:
-          branch: stable/hunter
-          slave: lf-virtual6
-          dashboard_url: http://172.30.13.91
 
 - parameter:
     name: functest-slave
@@ -147,13 +123,6 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          volumes=""
-          case "{tag}" in
-            arm-hunter)
-              volumes="-v /usr/bin/qemu-arm-static:/usr/bin/qemu-arm-static" ;;
-            arm64-hunter)
-              volumes="-v /usr/bin/qemu-aarch64-static:/usr/bin/qemu-aarch64-static" ;;
-          esac
           sudo docker run --rm \
             --privileged={privileged} \
             --network={network} \
@@ -173,7 +142,7 @@
             -v /home/opnfv/functest/.boto:/root/.boto \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
-            $volumes $image run_tests -t {test} -r -p
+            $image run_tests -t {test} -r -p
 
 - builder:
     name: functest-remove-images
@@ -468,76 +437,6 @@
         test: patrole_reader
       - tag: hunter
         test: tempest_cyborg
-      - tag: arm64-latest
-        test: refstack_defcore
-      - tag: arm64-latest
-        test: networking-bgpvpn
-      - tag: arm64-latest
-        test: networking-sfc
-      - tag: arm64-latest
-        test: patrole
-      - tag: arm64-leguer
-        test: refstack_defcore
-      - tag: arm64-leguer
-        test: networking-bgpvpn
-      - tag: arm64-leguer
-        test: networking-sfc
-      - tag: arm64-leguer
-        test: patrole
-      - tag: arm64-kali
-        test: refstack_defcore
-      - tag: arm64-kali
-        test: networking-bgpvpn
-      - tag: arm64-kali
-        test: networking-sfc
-      - tag: arm64-kali
-        test: patrole_admin
-      - tag: arm64-kali
-        test: patrole_member
-      - tag: arm64-kali
-        test: patrole_reader
-      - tag: arm64-jerma
-        test: refstack_defcore
-      - tag: arm64-jerma
-        test: networking-bgpvpn
-      - tag: arm64-jerma
-        test: networking-sfc
-      - tag: arm64-jerma
-        test: patrole_admin
-      - tag: arm64-jerma
-        test: patrole_member
-      - tag: arm64-jerma
-        test: patrole_reader
-      - tag: arm64-jerma
-        test: tempest_cyborg
-      - tag: arm64-iruya
-        test: refstack_defcore
-      - tag: arm64-iruya
-        test: patrole_admin
-      - tag: arm64-iruya
-        test: patrole_member
-      - tag: arm64-iruya
-        test: patrole_reader
-      - tag: arm64-iruya
-        test: tempest_cyborg
-      - tag: arm64-hunter
-        test: refstack_compute
-      - tag: arm64-hunter
-        test: refstack_object
-      - tag: arm64-hunter
-        test: refstack_platform
-      - tag: arm64-hunter
-        test: tempest_octavia
-      - tag: arm64-hunter
-        test: tempest_telemetry
-      - tag: arm64-hunter
-        test: patrole_admin
-      - tag: arm64-hunter
-        test: patrole_member
-      - tag: arm64-hunter
-        test: patrole_reader
-      - tag: arm64-hunter
-        test: tempest_cyborg
     privileged: 'false'
     network: bridge
     jobs:
@@ -616,13 +515,6 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          volumes=""
-          case "{tag}" in
-            arm-hunter)
-              volumes="-v /usr/bin/qemu-arm-static:/usr/bin/qemu-arm-static" ;;
-            arm64-hunter)
-              volumes="-v /usr/bin/qemu-aarch64-static:/usr/bin/qemu-aarch64-static" ;;
-          esac
           sudo docker run --rm \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest \
@@ -638,7 +530,7 @@
             -v /home/opnfv/functest/.boto:/root/.boto \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
-            $volumes $image zip_campaign
+            $image zip_campaign
 
 - job-template:
     name: 'functest-{tag}-zip'
@@ -888,13 +780,6 @@
     container: alpine
     tag: '3.12'
     slave: master
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
@@ -905,13 +790,6 @@
     container: alpine
     tag: '3.12'
     slave: master
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
@@ -921,13 +799,6 @@
     container: functest-core
     ref_arg: BRANCH
     path: docker/core
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
@@ -946,12 +817,6 @@
       - tag: leguer
       - tag: kali
       - tag: jerma
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
 
 - project:
     name: functest-opnfv-functest-healthcheck-{tag}-build
@@ -959,13 +824,6 @@
     container: functest-healthcheck
     ref_arg: BRANCH
     path: docker/healthcheck
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
@@ -976,13 +834,6 @@
     container: functest-smoke
     ref_arg: BRANCH
     path: docker/smoke
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
@@ -993,13 +844,6 @@
     container: functest-benchmarking
     ref_arg: BRANCH
     path: docker/benchmarking
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
@@ -1010,13 +854,6 @@
     container: functest-benchmarking-cntt
     ref_arg: BRANCH
     path: docker/benchmarking-cntt
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
@@ -1027,13 +864,6 @@
     container: functest-vnf
     ref_arg:
     path: docker/vnf
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
@@ -1044,13 +874,6 @@
     container: functest-smoke-cntt
     ref_arg: BRANCH
     path: docker/smoke-cntt
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
@@ -1498,13 +1321,6 @@
 - project:
     name: 'functest-gate'
     <<: *functest-params
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-leguer
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-{tag}-check'
       - 'functest-{tag}-gate'

diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml
index 836aaa2..c82ba68 100644 (file)
--- a/jjb/functest/xtesting-docker.yaml
+++ b/jjb/functest/xtesting-docker.yaml
@@ -31,8 +31,6 @@
     arch_tag:
       - 'amd64':
           slave_label: 'lf-build2'
-      - 'arm64':
-          slave_label: 'opnfv-build-ubuntu-arm'
 
     image:
       - 'core'
@@ -114,8 +112,6 @@
           projects:
             - name: 'xtesting-core-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'xtesting-core-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish xtesting manifests'
           execution-type: PARALLEL
@@ -128,8 +124,6 @@
           projects:
             - name: 'xtesting-mts-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'xtesting-mts-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish xtesting-mts manifests'
           execution-type: PARALLEL
@@ -140,7 +134,6 @@
 
     publishers:
       - 'xtesting-amd64-recipients'
-      - 'xtesting-arm64-recipients'
 
 - job-template:
     name: 'xtesting-{image}-docker-build-{arch_tag}-{stream}'
@@ -156,12 +149,7 @@
     builders:
       - shell: |
           #!/bin/bash -ex
-          case "{arch_tag}" in
-          "arm64")
-              sudo arch=arm64 amd64_dirs= arm64_dirs=docker/{image} arm_dirs= bash ./build.sh ;;
-          *)
-              sudo arch=amd64 amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh ;;
-          esac
+          sudo arch=amd64 amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh ;;
           exit $?
 
 - job-template:
@@ -209,7 +197,7 @@
               img="-{image}" ;;
           esac
           sudo manifest-tool push from-args \
-              --platforms linux/amd64,linux/arm64 \
+              --platforms linux/amd64 \
               --template $REPO/xtesting$img:ARCH-$tag \
               --target $REPO/xtesting$img:$tag
           exit $?
@@ -260,15 +248,6 @@
           description: "Repository name for xtesting images"
 
 # publisher macros
-- publisher:
-    name: 'xtesting-arm64-recipients'
-    publishers:
-      - email:
-          recipients: >
-            cristina.pauna@enea.com
-            alexandru.avadanii@enea.com
-            delia.popescu@enea.com
-
 - publisher:
     name: 'xtesting-amd64-recipients'
     publishers:

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index f4635ec..a71f5d2 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -26,24 +26,6 @@
       - hunter:
           branch: stable/hunter
           slave: lf-virtual1
-      - arm64-latest:
-          branch: master
-          slave: lf-virtual1
-      - arm64-leguer:
-          branch: stable/leguer
-          slave: lf-virtual1
-      - arm64-kali:
-          branch: stable/kali
-          slave: lf-virtual1
-      - arm64-jerma:
-          branch: stable/jerma
-          slave: lf-virtual1
-      - arm64-iruya:
-          branch: stable/iruya
-          slave: lf-virtual1
-      - arm64-hunter:
-          branch: stable/hunter
-          slave: lf-virtual1
 
 - parameter:
     name: xtesting-slave
@@ -209,10 +191,6 @@
       - tag: iruya
       - tag: jerma
       - tag: kali
-      - tag: arm64-hunter
-      - tag: arm64-iruya
-      - tag: arm64-jerma
-      - tag: arm64-kali
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
 
@@ -241,10 +219,6 @@
       - tag: iruya
       - tag: jerma
       - tag: kali
-      - tag: arm64-hunter
-      - tag: arm64-iruya
-      - tag: arm64-jerma
-      - tag: arm64-kali
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-rmi'
 
@@ -277,10 +251,6 @@
         test: sixth
       - tag: iruya
         test: sixth
-      - tag: arm64-hunter
-        test: sixth
-      - tag: arm64-iruya
-        test: sixth
     privileged: 'false'
     network: bridge
     jobs:
@@ -301,14 +271,6 @@
         test: seventh
       - tag: kali
         test: seventh
-      - tag: arm64-hunter
-        test: seventh
-      - tag: arm64-iruya
-        test: seventh
-      - tag: arm64-jerma
-        test: seventh
-      - tag: arm64-kali
-        test: seventh
     privileged: 'false'
     network: bridge
     jobs:
@@ -463,13 +425,6 @@
     container: alpine
     tag: '3.12'
     slave: master
-    exclude:
-      - tag: arm64-hunter
-      - tag: arm64-iruya
-      - tag: arm64-jerma
-      - tag: arm64-kali
-      - tag: arm64-leguer
-      - tag: arm64-latest
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
 
@@ -479,13 +434,6 @@
     container: xtesting
     ref_arg: BRANCH
     path: docker/core
-    exclude:
-      - tag: arm64-hunter
-      - tag: arm64-iruya
-      - tag: arm64-jerma
-      - tag: arm64-kali
-      - tag: arm64-leguer
-      - tag: arm64-latest
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-gate'
       - 'xtesting-{repo}-{container}-{tag}-check'
@@ -501,12 +449,6 @@
       - tag: iruya
       - tag: jerma
       - tag: kali
-      - tag: arm64-hunter
-      - tag: arm64-iruya
-      - tag: arm64-jerma
-      - tag: arm64-kali
-      - tag: arm64-leguer
-      - tag: arm64-latest
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-gate'
       - 'xtesting-{repo}-{container}-{tag}-check'
@@ -678,13 +620,6 @@
 - project:
     name: 'xtesting-gate'
     <<: *xtesting-params
-    exclude:
-      - tag: arm64-hunter
-      - tag: arm64-iruya
-      - tag: arm64-jerma
-      - tag: arm64-kali
-      - tag: arm64-leguer
-      - tag: arm64-latest
     jobs:
       - 'xtesting-{tag}-check'
       - 'xtesting-{tag}-gate'