Merge "fix the default node label for doctor test"

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index b93a56b..52e5b37 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -18,10 +18,6 @@
       stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
-    euphrates: &euphrates
-      stream: euphrates
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -43,11 +39,11 @@
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       # joid CI PODs
       - baremetal:
           slave-label: joid-baremetal
@@ -60,11 +56,11 @@
       - baremetal:
           slave-label: joid-baremetal
           installer: joid
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: joid-virtual
           installer: joid
-          <<: *euphrates
+          <<: *fraser
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
@@ -77,11 +73,11 @@
       - baremetal:
           slave-label: compass-baremetal
           installer: compass
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual
           installer: compass
-          <<: *euphrates
+          <<: *fraser
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
@@ -92,13 +88,13 @@
           installer: apex
           <<: *master
       - virtual:
-          slave-label: apex-virtual-euphrates
+          slave-label: apex-virtual-fraser
           installer: apex
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
-          slave-label: apex-baremetal-euphrates
+          slave-label: apex-baremetal-fraser
           installer: apex
-          <<: *euphrates
+          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
@@ -111,11 +107,11 @@
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           slave-label: armband-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       # daisy CI PODs
       - baremetal:
           slave-label: daisy-baremetal
@@ -128,11 +124,11 @@
       - baremetal:
           slave-label: daisy-baremetal
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: daisy-virtual
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       # netvirt 3rd party ci
       - virtual:
           slave-label: odl-netvirt-virtual
@@ -168,7 +164,7 @@
       - zte-pod1:
           slave-label: '{pod}'
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
@@ -176,7 +172,7 @@
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - zte-pod3:
           slave-label: '{pod}'
           installer: daisy
@@ -184,7 +180,7 @@
       - zte-pod3:
           slave-label: '{pod}'
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - zte-pod9:
           slave-label: '{pod}'
           installer: daisy

diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index 9017354..419c4e0 100755 (executable)
--- a/jjb/functest/functest-k8.sh
+++ b/jjb/functest/functest-k8.sh
@@ -42,17 +42,23 @@ DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*
 
 set +e
 
-FUNCTEST_IMAGE=opnfv/functest-kubernetes:${DOCKER_TAG}
-echo "Pulling Docker image ${FUNCTEST_IMAGE} ..."
-docker pull ${FUNCTEST_IMAGE}>/dev/null
-cmd_opt="run_tests -r -t all"
-cmd="docker run --rm ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
-echo "Running Functest k8s test cases, CMD: ${cmd}"
-eval ${cmd}
-ret_value=$?
-
 ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
 echo 0 > ${ret_val_file}
-if [ ${ret_value} != 0 ]; then
-  echo ${ret_value} > ${ret_val_file}
-fi
+
+FUNCTEST_IMAGES="\
+opnfv/functest-kubernetes-healthcheck:${DOCKER_TAG} \
+opnfv/functest-kubernetes-smoke:${DOCKER_TAG} \
+opnfv/functest-kubernetes-features:${DOCKER_TAG}"
+cmd_opt="run_tests -r -t all"
+
+for image in ${FUNCTEST_IMAGES}; do
+    echo "Pulling Docker image ${image} ..."
+    docker pull "${image}" >/dev/null
+    cmd="docker run --rm ${envs} ${volumes} ${image} /bin/bash -c '${cmd_opt}'"
+    echo "Running Functest k8s test cases, CMD: ${cmd}"
+    eval ${cmd}
+    ret_value=$?
+    if [ ${ret_value} != 0 ]; then
+        echo ${ret_value} > ${ret_val_file}
+    fi
+done

diff --git a/jjb/functest/functest-kubernetes-docker.yml b/jjb/functest/functest-kubernetes-docker.yml
index de1895d..2085251 100644 (file)
--- a/jjb/functest/functest-kubernetes-docker.yml
+++ b/jjb/functest/functest-kubernetes-docker.yml
@@ -23,6 +23,9 @@
     # yamllint disable rule:key-duplicates
     image:
       - 'core'
+      - 'healthcheck'
+      - 'smoke'
+      - 'features'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -89,6 +92,20 @@
           projects:
             - name: 'functest-kubernetes-core-docker-build-amd64-{stream}'
               <<: *build-job-settings
+      - multijob:
+          name: 'build functest-kubernetes-[healthcheck,features] image'
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-kubernetes-healthcheck-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-kubernetes-features-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+      - multijob:
+          name: 'build functest-kubernetes-smoke image'
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-kubernetes-smoke-docker-build-amd64-{stream}'
+              <<: *build-job-settings
 
     publishers:
       - 'functest-kubernetes-amd64-recipients'
@@ -107,16 +124,7 @@
     builders:
       - shell: |
           #!/bin/bash -ex
-          case "{stream}" in
-          "master")
-              tag="latest" ;;
-          *)
-              tag="{stream}" ;;
-          esac
-          (cd docker && sudo docker build --pull=true --no-cache --force-rm=true \
-              -t "$REPO/functest-kubernetes:$tag" .)
-          sudo docker push "$REPO/functest-kubernetes:$tag"
-          sudo docker rmi "$REPO/functest-kubernetes:$tag"
+          sudo amd64_dirs=docker/{image} bash ./build.sh
           exit $?
 
 # parameter macro

diff --git a/jjb/functest/functest-weekly-jobs.yml b/jjb/functest/functest-weekly-jobs.yml
index d87ac2f..c88fa00 100644 (file)
--- a/jjb/functest/functest-weekly-jobs.yml
+++ b/jjb/functest/functest-weekly-jobs.yml
@@ -22,12 +22,6 @@
       gs-pathname: '/{stream}'
       docker-tag: '{stream}'
       disabled: false
-    euphrates: &euphrates
-      stream: euphrates
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
-      docker-tag: '{stream}'
-      disabled: false
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -49,11 +43,11 @@
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
     # -------------------------------
     jobs:
       - 'functest-{installer}-{pod}-weekly-{stream}'

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 630a7ea..81e7875 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -77,6 +77,36 @@
           project: 'bottlenecks'
           <<: *master
           <<: *other-receivers
+      - 'clover':
+          project: 'clover'
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-lb':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-proxy':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-server':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-snort-ids':
+          project: 'clover'
+          dockerdir: 'samples/services/snort_ids/docker'
+          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          <<: *master
+          <<: *other-receivers
       - 'cperf':
           project: 'cperf'
           <<: *master
@@ -186,7 +216,37 @@
           project: 'dovetail'
           <<: *danube
           <<: *other-receivers
-
+      # projects with jobs for fraser
+      - 'clover':
+          project: 'clover'
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-lb':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-proxy':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-server':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-snort-ids':
+          project: 'clover'
+          dockerdir: 'samples/services/snort_ids/docker'
+          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
     # yamllint enable rule:key-duplicates
     jobs:
       - "{dockerrepo}-docker-build-push-{stream}"