From: Rihab Banday <rihab.banday@ericsson.com>
Date: Thu, 18 Feb 2021 16:28:02 +0000 (+0100)
Subject: Update .gitlab-ci.yml to support functest v1.18
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kuberef.git;a=commitdiff_plain;h=aa694d7a5e46c40bf5f22734bef7da7f6ddf7624

Update .gitlab-ci.yml to support functest v1.18

This patch updates the current GitLab CI based
pipeline to run functest v1.18 compliance tests
on Intel Pod 19.

Change-Id: Ib36fd6bf421c7eaa3223234c4f3c739cb1250f22
Signed-off-by: Rihab Banday <rihab.banday@ericsson.com>
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/72113
Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Reviewed-by: Michael Pedersen <michaelx.pedersen@intel.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51291b8..e7a6f6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,16 +26,16 @@ stages:
 
 deploy:
   tags:
-    - ericsson-pod2
+    - intel-pod19-shell
   stage: deploy_platform
   script:
     - bash deploy.sh
 
 k8s_quick:
   tags:
-    - ericsson-pod2-docker
+    - intel-pod19-docker
   stage: functest-kubernetes-healthcheck
-  image: opnfv/functest-kubernetes-healthcheck:jerma
+  image: opnfv/functest-kubernetes-healthcheck:v1.18
   script:
     - run_tests -t k8s_quick -p -r
 
@@ -43,7 +43,7 @@ k8s_smoke:
   tags:
     - ericsson-pod2-docker
   stage: functest-kubernetes-healthcheck
-  image: opnfv/functest-kubernetes-healthcheck:jerma
+  image: opnfv/functest-kubernetes-healthcheck:v1.18
   script:
     - run_tests -t k8s_smoke -p -r
 
@@ -53,7 +53,7 @@ xrally_kubernetes:
   tags:
     - ericsson-pod2-docker
   stage: functest-kubernetes-smoke
-  image: opnfv/functest-kubernetes-smoke:jerma
+  image: opnfv/functest-kubernetes-smoke:v1.18
   timeout: 3 hours 30 minutes
   script:
     - run_tests -t xrally_kubernetes -p -r
@@ -64,7 +64,7 @@ k8s_conformance:
   tags:
     - ericsson-pod2-docker
   stage: functest-kubernetes-smoke
-  image: opnfv/functest-kubernetes-smoke:jerma
+  image: opnfv/functest-kubernetes-smoke:v1.18
   timeout: 3 hours 30 minutes
   script:
     - run_tests -t k8s_conformance -p -r
@@ -75,7 +75,7 @@ kube_hunter:
   tags:
     - ericsson-pod2-docker
   stage: functest-kubernetes-security
-  image: opnfv/functest-kubernetes-security:jerma
+  image: opnfv/functest-kubernetes-security:v1.18
   script:
     - run_tests -t kube_hunter -p -r
 
@@ -85,7 +85,7 @@ kube_bench_master:
   tags:
     - ericsson-pod2-docker
   stage: functest-kubernetes-security
-  image: opnfv/functest-kubernetes-security:jerma
+  image: opnfv/functest-kubernetes-security:v1.18
   script:
     - run_tests -t kube_bench_master -p -r
 
@@ -95,7 +95,7 @@ kube_bench_node:
   tags:
     - ericsson-pod2-docker
   stage: functest-kubernetes-security
-  image: opnfv/functest-kubernetes-security:jerma
+  image: opnfv/functest-kubernetes-security:v1.18
   script:
     - run_tests -t kube_bench_node -p -r
 
@@ -105,7 +105,7 @@ xrally_kubernetes_full:
   tags:
     - ericsson-pod2-docker
   stage: functest-kubernetes-benchmarking
-  image: opnfv/functest-kubernetes-benchmarking:jerma
+  image: opnfv/functest-kubernetes-benchmarking:v1.18
   script:
     - run_tests -t xrally_kubernetes_full -p -r
 
@@ -115,7 +115,7 @@ k8s_vims:
   tags:
     - ericsson-pod2-docker
   stage: functest-kubernetes-cnf
-  image: opnfv/functest-kubernetes-cnf:jerma
+  image: opnfv/functest-kubernetes-cnf:v1.18
   script:
     - run_tests -t k8s_vims -p -r
 
@@ -125,7 +125,7 @@ helm_vims:
   tags:
     - ericsson-pod2-docker
   stage: functest-kubernetes-cnf
-  image: opnfv/functest-kubernetes-cnf:jerma
+  image: opnfv/functest-kubernetes-cnf:v1.18
   script:
     - run_tests -t helm_vims -p -r
 
@@ -135,7 +135,7 @@ cnf_conformance:
   tags:
     - ericsson-pod2-docker
   stage: functest-kubernetes-cnf
-  image: opnfv/functest-kubernetes-cnf:jerma
+  image: opnfv/functest-kubernetes-cnf:v1.18
   script:
     - run_tests -t cnf_conformance -p -r
 
@@ -143,11 +143,11 @@ zip:
   only:
     - schedules
   tags:
-    - ericsson-pod2-docker
+    - intel-pod19-docker
   stage: zip
   variables:
     S3_DST_URL: s3://artifacts.opnfv.org/kuberef/
     HTTP_DST_URL: http://artifacts.opnfv.org/kuberef/
-  image: opnfv/functest-kubernetes-healthcheck:jerma
+  image: opnfv/functest-kubernetes-healthcheck:v1.18
   script:
     - zip_campaign
diff --git a/deploy.env b/deploy.env
index 94e5425..85641ce 100644
--- a/deploy.env
+++ b/deploy.env
@@ -1,6 +1,6 @@
 # Define environment variables
 
-export VENDOR=${VENDOR:-ericsson-pod2}
+export VENDOR=${VENDOR:-intel}
 export INSTALLER=bmra
 export BMRA_PROFILE=$(yq r $CURRENTPATH/hw_config/$VENDOR/idf.yaml bmra.profile)