X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=.travis.yml;h=f0bafbfce3b702742594830abd2236fe1b01642e;hb=71ba783c1279370af035ff7cac2de7522e95de78;hp=af67f4786b90012248ed62e58b54a20e4cb5bfc7;hpb=ed777b643b05fbb71851df0b883483e0bcaa4ac1;p=functest-xtesting.git

diff --git a/.travis.yml b/.travis.yml
index af67f478..f0bafbfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,119 +15,113 @@ jobs:
       script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs=""
-        - aarch64_dirs="docker/core"
+        - amd64_dirs=""
+        - arm64_dirs="docker/core"
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs="docker/core"
-        - aarch64_dirs=""
+        - amd64_dirs="docker/core"
+        - arm64_dirs=""
     - stage: publish functest-core manifests
       script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64,linux/arm64 \
-          --template ${DOCKER_USERNAME}/functest-core:x86_64-latest \
-          --template ${DOCKER_USERNAME}/functest-core:aarch64-latest \
+          --template ${DOCKER_USERNAME}/functest-core:ARCH-latest \
           --target ${DOCKER_USERNAME}/functest-core:latest
     - stage: build all functest images
       script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs=""
-        - aarch64_dirs="docker/healthcheck"
+        - amd64_dirs=""
+        - arm64_dirs="docker/healthcheck"
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs=""
-        - aarch64_dirs="docker/smoke"
+        - amd64_dirs=""
+        - arm64_dirs="docker/smoke"
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs=""
-        - aarch64_dirs="docker/features"
+        - amd64_dirs=""
+        - arm64_dirs="docker/features"
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs=""
-        - aarch64_dirs="docker/components"
+        - amd64_dirs=""
+        - arm64_dirs="docker/components"
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs="docker/healthcheck"
-        - aarch64_dirs=""
+        - amd64_dirs="docker/healthcheck"
+        - arm64_dirs=""
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs="docker/smoke"
-        - aarch64_dirs=""
+        - amd64_dirs="docker/smoke"
+        - arm64_dirs=""
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs="docker/features"
-        - aarch64_dirs=""
+        - amd64_dirs="docker/features"
+        - arm64_dirs=""
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs="docker/components"
-        - aarch64_dirs=""
+        - amd64_dirs="docker/components"
+        - arm64_dirs=""
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs="docker/vnf"
-        - aarch64_dirs=""
+        - amd64_dirs="docker/vnf"
+        - arm64_dirs=""
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs="docker/restapi"
-        - aarch64_dirs=""
+        - amd64_dirs="docker/restapi"
+        - arm64_dirs=""
     - script: sudo -E bash build.sh
       env:
         - repo="${DOCKER_USERNAME}"
-        - x86_64_dirs="docker/parser"
-        - aarch64_dirs=""
+        - amd64_dirs="docker/parser"
+        - arm64_dirs=""
     - stage: publish all manifests
       script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64,linux/arm64 \
-          --template ${DOCKER_USERNAME}/functest-healthcheck:x86_64-latest \
-          --template ${DOCKER_USERNAME}/functest-healthcheck:aarch64-latest \
+          --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-latest \
           --target ${DOCKER_USERNAME}/functest-healthcheck:latest
     - script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64,linux/arm64 \
-          --template ${DOCKER_USERNAME}/functest-healthcheck:x86_64-latest \
-          --template ${DOCKER_USERNAME}/functest-healthcheck:aarch64-latest \
+          --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-latest \
           --target ${DOCKER_USERNAME}/functest-healthcheck:latest
     - script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64,linux/arm64 \
-          --template ${DOCKER_USERNAME}/functest-smoke:x86_64-latest \
-          --template ${DOCKER_USERNAME}/functest-smoke:aarch64-latest \
+          --template ${DOCKER_USERNAME}/functest-smoke:ARCH-latest \
           --target ${DOCKER_USERNAME}/functest-smoke:latest
     - script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64,linux/arm64 \
-          --template ${DOCKER_USERNAME}/functest-features:x86_64-latest \
-          --template ${DOCKER_USERNAME}/functest-features:aarch64-latest \
+          --template ${DOCKER_USERNAME}/functest-features:ARCH-latest \
           --target ${DOCKER_USERNAME}/functest-features:latest
     - script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64,linux/arm64 \
-          --template ${DOCKER_USERNAME}/functest-components:x86_64-latest \
-          --template ${DOCKER_USERNAME}/functest-components:aarch64-latest \
+          --template ${DOCKER_USERNAME}/functest-components:ARCH-latest \
           --target ${DOCKER_USERNAME}/functest-components:latest
     - script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64 \
-          --template ${DOCKER_USERNAME}/functest-vnf:x86_64-latest \
+          --template ${DOCKER_USERNAME}/functest-vnf:ARCH-latest \
           --target ${DOCKER_USERNAME}/functest-vnf:latest
     - script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64 \
-          --template ${DOCKER_USERNAME}/functest-restapi:x86_64-latest \
+          --template ${DOCKER_USERNAME}/functest-restapi:ARCH-latest \
           --target ${DOCKER_USERNAME}/functest-restapi:latest
     - script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64 \
-          --template ${DOCKER_USERNAME}/functest-parser:x86_64-latest \
+          --template ${DOCKER_USERNAME}/functest-parser:ARCH-latest \
           --target ${DOCKER_USERNAME}/functest-parser:latest