Merge "Add a job to run new proposed_tests on Apex"

diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index 9dc8074..4672102 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yaml
+++ b/jjb/compass4nfv/compass-ci-jobs.yaml
@@ -219,6 +219,7 @@
       # only run on os-(nosdn|odl_l3)-nofeature-ha scenario
       # run with testsuite default, testarea mandatory, dovetail docker image with latest tag
       # run with testsuite default, testarea optional, dovetail docker image with latest tag
+      # run with testsuite proposed_tests, testarea optional, dovetail docker image with latest tag
       - conditional-step:
           condition-kind: and
           condition-operands:
@@ -238,14 +239,6 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: os-(nosdn|odl_l3)-nofeature-ha
-              label: '{scenario}'
-          steps:
-            - trigger-builds:
                 - project: 'dovetail-compass-{pod}-default-optional-{stream}'
                   current-parameters: false
                   predefined-parameters: |
@@ -257,6 +250,17 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
+                - project: 'dovetail-compass-{pod}-proposed_tests-optional-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    DOCKER_TAG=latest
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
       - conditional-step:
           condition-kind: and
           condition-operands:

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 982b83e..6717b78 100644 (file)
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -214,7 +214,8 @@
       # 2.testsuite default here is for the test cases already added into OVP
       # 3.run default testsuite mandatory test cases against ha scenario
       # 4.run default testsuite optional test cases against ha scenario twice one week
-      # 5.not used for release criteria or compliance, only to debug the dovetail tool bugs
+      # 5.run proposed_tests testsuite optional test cases against ha scenario
+      # 6.not used for release criteria or compliance, only to debug the dovetail tool bugs
       - conditional-step:
           condition-kind: and
           condition-operands:
@@ -234,6 +235,17 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
+                - project: 'dovetail-fuel-{pod}-proposed_tests-optional-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    DEPLOY_SCENARIO={scenario}
+                    INSTALLER_VERSION={stream}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
       - conditional-step:
           condition-kind: and
           condition-operands:

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 7d842b0..18fec99 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -162,6 +162,8 @@ identity-feature-enabled:
 image-feature-enabled:
     api_v2: true
     api_v1: false
+object-storage:
+    operator_role: SwiftOperator
 volume:
     storage_protocol: ceph
 volume-feature-enabled:
@@ -225,6 +227,26 @@ volume-feature-enabled:
 EOF
     ;;
 esac
+case ${BRANCH} in
+master)
+    cat << EOF >> "${tempest_conf_yaml}"
+compute:
+    max_microversion: latest
+EOF
+    ;;
+stable/hunter)
+    cat << EOF >> "${tempest_conf_yaml}"
+compute:
+    max_microversion: 2.65
+EOF
+    ;;
+stable/gambia)
+    cat << EOF >> "${tempest_conf_yaml}"
+compute:
+    max_microversion: 2.60
+EOF
+    ;;
+esac
 echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}"
 
 volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \

diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index 419c4e0..8561b02 100755 (executable)
--- a/jjb/functest/functest-k8.sh
+++ b/jjb/functest/functest-k8.sh
@@ -20,6 +20,13 @@ if [[ ${INSTALLER_TYPE} == 'compass' ]]; then
 elif [[ ${INSTALLER_TYPE} == 'joid' && ${BRANCH} == 'master' ]]; then
     admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/.kube/config"
     rc_file=${HOME}/joid_config/k8config
+elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
+    admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
+    KUBE_MASTER_URL=$(awk '/server:/ {print $2}' ${HOME}/admin.conf | grep -Fv localhost)
+    KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL | grep -Po '(\d+\.){3}\d+')
+    for k in KUBERNETES_PROVIDER KUBE_MASTER_URL KUBE_MASTER_IP; do
+        echo "export $k=${!k}" >> $rc_file
+    done
 else
     echo "Not supported by other installers yet"
     exit 1

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 80f08ef..1c2ed83 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -8,8 +8,6 @@
     repo: 'opnfv'
     port:
     tag:
-      - latest:
-          branch: master
       - hunter:
           branch: stable/hunter
 
@@ -236,7 +234,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -301,20 +299,20 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+    name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
     repo: _
     port:
     container: golang
-    tag: alpine3.8
+    tag: alpine3.9
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+    name: 'functest-kubernetes-_-golang-alpine3.9-pull'
     repo: _
     port:
     container: golang
-    tag: alpine3.8
+    tag: alpine3.9
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -370,7 +368,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -384,12 +382,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -462,7 +460,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -476,12 +474,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index e4a7de9..29fd156 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -313,7 +313,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -457,20 +457,20 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.8-rmi'
+    name: 'functest-_-alpine-3.9-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.8-pull'
+    name: 'functest-_-alpine-3.9-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
@@ -556,7 +556,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -574,12 +574,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.9-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.9-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -729,7 +729,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -747,12 +747,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.9-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.9-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 3f86b05..2c5babd 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -12,8 +12,6 @@
           branch: master
       - hunter:
           branch: stable/hunter
-      - gambia:
-          branch: stable/gambia
 
 - parameter:
     name: xtesting-slave
@@ -246,20 +244,20 @@
           ref: $branch
 
 - project:
-    name: 'xtesting-_-alpine-3.8-rmi'
+    name: 'xtesting-_-alpine-3.9-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'xtesting-_-alpine-3.8-pull'
+    name: 'xtesting-_-alpine-3.9-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
 
@@ -295,12 +293,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.8-rmi'
+            - name: 'xtesting-_-alpine-3.9-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.8-pull'
+            - name: 'xtesting-_-alpine-3.9-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/functest-xtesting
@@ -367,12 +365,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.8-rmi'
+            - name: 'xtesting-_-alpine-3.9-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.8-pull'
+            - name: 'xtesting-_-alpine-3.9-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/functest-xtesting

diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml
index 7e87c5f..102069a 100644 (file)
--- a/jjb/releng/opnfv-docker-arm.yaml
+++ b/jjb/releng/opnfv-docker-arm.yaml
@@ -44,6 +44,7 @@
     dockerdir: "docker"
     docker_repo_name: "opnfv/{project}_aarch64"
     arch_tag: ""
+    extra_build_args: ""
 
     # yamllint disable rule:key-duplicates
     dockerrepo:
@@ -177,6 +178,10 @@
           name: ARCH_TAG
           default: "{arch_tag}"
           description: "If set, this value will be added to the docker image tag"
+      - string:
+          name: EXTRA_BUILD_ARGS
+          default: "{extra_build_args}"
+          description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image"
 
     properties:
       - throttle:

diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index e647641..174bb57 100644 (file)
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -130,12 +130,18 @@ if [[ -n "${ARCH_TAG}" ]]; then
     ARCH_BUILD_ARG="--build-arg ARCH=${ARCH_TAG}"
 fi
 
+EXTRA_BUILD_ARGS=${EXTRA_BUILD_ARGS:-}
+if [ -n "${EXTRA_BUILD_ARGS}" ]; then
+    EXTRA_BUILD_ARGS=" "$(echo ${EXTRA_BUILD_ARGS})
+    EXTRA_BUILD_ARGS=${EXTRA_BUILD_ARGS// / --build-arg }
+fi
+
 # Start the build
 echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG"
 echo "--------------------------------------------------------"
 echo
 cmd="docker build --pull=true --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BUILD_BRANCH
-    $ARCH_BUILD_ARG
+    $ARCH_BUILD_ARG $EXTRA_BUILD_ARGS
     -f $DOCKERFILE $DOCKER_PATH"
 
 echo ${cmd}

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 591452a..1458339 100644 (file)
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -45,6 +45,7 @@
     dockerfile: "Dockerfile"
     dockerdir: "docker"
     arch_tag: ""
+    extra_build_args: ""
 
     # This is the dockerhub repo the image will be pushed to as
     # 'opnfv/{dockerrepo}. See: DOCKER_REPO_NAME parameter.
@@ -203,6 +204,12 @@
           dockerfile: 'Dockerfile.web'
           <<: *master
           <<: *other-receivers
+      - 'dovetail-webportal-web-onap':
+          project: 'dovetail-webportal'
+          dockerfile: 'Dockerfile.web'
+          extra_build_args: 'CONTAINER=onap GUI=onap-ui'
+          <<: *master
+          <<: *other-receivers
       - 'nfvbench':
           project: 'nfvbench'
           <<: *master
@@ -415,6 +422,7 @@
     dockerfile: "Dockerfile"
     dockerdir: "docker"
     arch_tag: ""
+    extra_build_args: ""
 
     project:
       # projects with jobs for master
@@ -466,6 +474,10 @@
           name: ARCH_TAG
           default: "{arch_tag}"
           description: "If set, this value will be added to the docker image tag as a prefix"
+      - string:
+          name: EXTRA_BUILD_ARGS
+          default: "{extra_build_args}"
+          description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image"
 
     properties:
       - throttle:

diff --git a/releases/hunter/snaps.yaml b/releases/hunter/snaps.yaml
new file mode 100644 (file)
index 0000000..3558ec7
--- /dev/null
+++ b/releases/hunter/snaps.yaml
@@ -0,0 +1,9 @@
+---
+project: snaps
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      snaps: 567cdf25e1319fbc8a1a874dd18d21f88948e67e

diff --git a/utils/fetch_k8_conf.sh b/utils/fetch_k8_conf.sh
index 32c07f8..b3be0d6 100755 (executable)
--- a/utils/fetch_k8_conf.sh
+++ b/utils/fetch_k8_conf.sh
@@ -59,6 +59,9 @@ if [ "$installer_type" == "compass" ]; then
     info "Fetch admin.conf successfully"
 elif [ "$installer_type" == "joid" ]; then
     info "Do nothing, config file has been provided in $HOME/joid_config/config for joid"
+elif [ "$installer_type" == "fuel" ]; then
+    info "Getting kubernetes config ..."
+    docker cp fuel:/opt/kubernetes.config $dest_path
 else
     error "Installer $installer_type is not supported by this script"
 fi