Merge "Stable Branching for availability project"
authorTrevor Bramwell <tbramwell@linuxfoundation.org>
Mon, 1 Apr 2019 15:59:17 +0000 (15:59 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 1 Apr 2019 15:59:17 +0000 (15:59 +0000)
26 files changed:
jjb/apex/apex.yaml
jjb/apex/apex.yaml.j2
jjb/compass4nfv/compass-ci-jobs.yaml
jjb/fuel/fuel-daily-jobs.yaml
jjb/functest/functest-docker.yaml
jjb/functest/functest-k8.sh
jjb/functest/functest-kubernetes-docker.yaml
jjb/functest/functest-kubernetes-project-jobs.yaml
jjb/functest/functest-kubernetes.yaml
jjb/functest/functest-project-jobs.yaml
jjb/functest/functest.yaml
jjb/functest/xtesting-docker.yaml
jjb/functest/xtesting-project-jobs.yaml
jjb/functest/xtesting.yaml
jjb/releng/opnfv-docker-arm.yaml
jjb/releng/opnfv-docker.sh
jjb/releng/opnfv-docker.yaml
jjb/releng/releng-release-jobs.yaml
releases/hunter/clover.yaml [new file with mode: 0644]
releases/hunter/doctor.yaml [new file with mode: 0644]
releases/hunter/fds.yaml [new file with mode: 0644]
releases/hunter/ipv6.yaml [new file with mode: 0644]
releases/hunter/vswitchperf.yaml [new file with mode: 0644]
releases/hunter/yardstick.yaml [new file with mode: 0644]
releases/iruya/functest.yaml [new file with mode: 0644]
utils/fetch_k8_conf.sh

index 85e9b18..70a38f6 100644 (file)
@@ -16,7 +16,6 @@
       - 'apex-create-snapshot'
       - 'apex-fetch-snap-info'
       - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
-      - 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube'
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
     stream:
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail-proposed_tests
+          name: Dovetail-default-mandatory
           condition: ALWAYS
           projects:
             - name: 'dovetail-apex-baremetal-default-mandatory-{scenario_stream}'
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail-default
+          name: Dovetail-default-optional
           condition: ALWAYS
           projects:
             - name: 'dovetail-apex-baremetal-default-optional-{scenario_stream}'
               enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
+      - multijob:
+          name: Dovetail-proposed_tests
+          condition: ALWAYS
+          projects:
+            - name: 'dovetail-apex-baremetal-proposed_tests-optional-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
+              abort-all-job: false
+              git-revision: false
       - multijob:
           name: StorPerf
           condition: ALWAYS
               abort-all-job: false
               git-revision: false
 
-# Dovetail Danube test job
-- job-template:
-    name: 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube'
-
-    project-type: 'multijob'
-
-    node: 'huawei-pod4'
-
-    disabled: false
-
-    parameters:
-      - '{project}-defaults'
-      - project-parameter:
-          project: '{project}'
-          branch: 'stable/danube'
-      - apex-parameter:
-          gs-pathname: '/danube'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
-          description: "Scenario to deploy with."
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
-          blocking-jobs:
-            - 'apex-verify.*'
-            - 'apex-runner.*'
-            - 'apex-.*-promote.*'
-            - 'apex-run.*'
-
-    triggers:
-      - timed: ''  # '0 1 * * *'
-
-    builders:
-      - description-setter:
-          description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-      - multijob:
-          name: 'Baremetal Deploy'
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-deploy-baremetal-danube'
-              node-parameters: true
-              current-parameters: true
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: false
-      - multijob:
-          name: Dovetail
-          condition: ALWAYS
-          projects:
-            - name: 'dovetail-apex-baremetal-proposed_tests-danube'
-              node-parameters: true
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: NEVER
-              abort-all-job: false
-              git-revision: false
 
 ########################
 # parameter macros
index aaa166e..47ea18b 100644 (file)
@@ -16,7 +16,6 @@
       - 'apex-create-snapshot'
       - 'apex-fetch-snap-info'
       - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
-      - 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube'
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
     stream:
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail-proposed_tests
+          name: Dovetail-default-mandatory
           condition: ALWAYS
           projects:
             - name: 'dovetail-apex-baremetal-default-mandatory-{scenario_stream}'
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail-default
+          name: Dovetail-default-optional
           condition: ALWAYS
           projects:
             - name: 'dovetail-apex-baremetal-default-optional-{scenario_stream}'
               enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
+      - multijob:
+          name: Dovetail-proposed_tests
+          condition: ALWAYS
+          projects:
+            - name: 'dovetail-apex-baremetal-proposed_tests-optional-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
+              abort-all-job: false
+              git-revision: false
       - multijob:
           name: StorPerf
           condition: ALWAYS
               abort-all-job: false
               git-revision: false
 
-# Dovetail Danube test job
-- job-template:
-    name: 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube'
-
-    project-type: 'multijob'
-
-    node: 'huawei-pod4'
-
-    disabled: false
-
-    parameters:
-      - '{project}-defaults'
-      - project-parameter:
-          project: '{project}'
-          branch: 'stable/danube'
-      - apex-parameter:
-          gs-pathname: '/danube'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
-          description: "Scenario to deploy with."
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
-          blocking-jobs:
-            - 'apex-verify.*'
-            - 'apex-runner.*'
-            - 'apex-.*-promote.*'
-            - 'apex-run.*'
-
-    triggers:
-      - timed: ''  # '0 1 * * *'
-
-    builders:
-      - description-setter:
-          description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-      - multijob:
-          name: 'Baremetal Deploy'
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-deploy-baremetal-danube'
-              node-parameters: true
-              current-parameters: true
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: false
-      - multijob:
-          name: Dovetail
-          condition: ALWAYS
-          projects:
-            - name: 'dovetail-apex-baremetal-proposed_tests-danube'
-              node-parameters: true
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: NEVER
-              abort-all-job: false
-              git-revision: false
 
 ########################
 # parameter macros
index 9dc8074..4672102 100644 (file)
       # 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:
                     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: |
                     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:
index 982b83e..6717b78 100644 (file)
       # 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:
                     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:
index d831db5..dc833f5 100644 (file)
@@ -12,6 +12,9 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - iruya:
+          branch: 'stable/{stream}'
+          disabled: false
       - hunter:
           branch: 'stable/{stream}'
           disabled: false
@@ -39,6 +42,8 @@
     exclude:
       - stream: 'master'
         image: 'components'
+      - stream: 'iruya'
+        image: 'components'
       - stream: 'hunter'
         image: 'components'
 
index 8561b02..a4d80e1 100755 (executable)
@@ -24,7 +24,7 @@ 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
+    for k in KUBE_MASTER_URL KUBE_MASTER_IP; do
         echo "export $k=${!k}" >> $rc_file
     done
 else
index 9a074da..c70aae3 100644 (file)
@@ -12,6 +12,9 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - iruya:
+          branch: 'stable/{stream}'
+          disabled: false
       - hunter:
           branch: 'stable/{stream}'
           disabled: false
index 6dcd880..7fd2525 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - iruya: &iruya
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - hunter: &hunter
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
index 3bdb61d..628b06e 100644 (file)
@@ -8,8 +8,8 @@
     repo: 'opnfv'
     port:
     tag:
-      - latest:
-          branch: master
+      - iruya:
+          branch: stable/iruya
       - hunter:
           branch: stable/hunter
 
index 35a18cf..57fad77 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - iruya:
+          branch: 'stable/{stream}'
+          gs-pathname: ''
+          disabled: false
       - hunter:
           branch: 'stable/{stream}'
           gs-pathname: ''
index 4951352..9792950 100644 (file)
@@ -10,6 +10,8 @@
     tag:
       - latest:
           branch: master
+      - iruya:
+          branch: stable/iruya
       - hunter:
           branch: stable/hunter
 
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
index f45e25c..4847bbd 100644 (file)
@@ -12,6 +12,9 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - iruya:
+          branch: 'stable/{stream}'
+          disabled: false
       - hunter:
           branch: 'stable/{stream}'
           disabled: false
index e141f78..15c376b 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - iruya: &iruya
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - hunter: &hunter
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
index 2c5babd..94e00d1 100644 (file)
@@ -10,6 +10,8 @@
     tag:
       - latest:
           branch: master
+      - iruya:
+          branch: stable/iruya
       - hunter:
           branch: stable/hunter
 
index 7e87c5f..102069a 100644 (file)
@@ -44,6 +44,7 @@
     dockerdir: "docker"
     docker_repo_name: "opnfv/{project}_aarch64"
     arch_tag: ""
+    extra_build_args: ""
 
     # yamllint disable rule:key-duplicates
     dockerrepo:
           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:
index e647641..174bb57 100644 (file)
@@ -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}
index 591452a..1458339 100644 (file)
@@ -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.
           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
     dockerfile: "Dockerfile"
     dockerdir: "docker"
     arch_tag: ""
+    extra_build_args: ""
 
     project:
       # projects with jobs for master
           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:
index d79771f..784d648 100644 (file)
@@ -16,6 +16,7 @@
       - fraser
       - gambia
       - hunter
+      - iruya
 
     jobs:
       - 'releng-release-{stream}-verify'
diff --git a/releases/hunter/clover.yaml b/releases/hunter/clover.yaml
new file mode 100644 (file)
index 0000000..1bc9288
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: clover
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      clover: 3f86a3d611f4d2a4f21d9be2a2284ccf120db36e
diff --git a/releases/hunter/doctor.yaml b/releases/hunter/doctor.yaml
new file mode 100644 (file)
index 0000000..ff16aec
--- /dev/null
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2019 Nokia Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: doctor
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      doctor: 73605c5c34b97ab56306bfa9af0f5888f3c7e46d
diff --git a/releases/hunter/fds.yaml b/releases/hunter/fds.yaml
new file mode 100644 (file)
index 0000000..8c33218
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: fds
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      fds: 20cef81fd594f10949e151fd5a0a439af0a844e4
diff --git a/releases/hunter/ipv6.yaml b/releases/hunter/ipv6.yaml
new file mode 100644 (file)
index 0000000..8538237
--- /dev/null
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: ipv6
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      ipv6: 3084e2b829dc88a129ee9cdb65afa81986a6bfed
+
+release-notes: https://opnfv-ipv6.readthedocs.io/en/stable-hunter/release/release-notes/
diff --git a/releases/hunter/vswitchperf.yaml b/releases/hunter/vswitchperf.yaml
new file mode 100644 (file)
index 0000000..f0335f4
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: vswitchperf
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      vswitchperf: 589639d313c24104b2a27ef16baf716d1d274108
diff --git a/releases/hunter/yardstick.yaml b/releases/hunter/yardstick.yaml
new file mode 100644 (file)
index 0000000..88391b0
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: yardstick
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      yardstick: 85899baa90714ae15add21a330316793071168ae
diff --git a/releases/iruya/functest.yaml b/releases/iruya/functest.yaml
new file mode 100644 (file)
index 0000000..c9514b8
--- /dev/null
@@ -0,0 +1,15 @@
+---
+project: functest
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      functest: daf01598d6030a29ccddc3023ee94fe9b0e3b320
+  - name: stable/iruya
+    location:
+      functest-kubernetes: fd130c880d4d185153efe3e3e0aa24c95052c320
+  - name: stable/iruya
+    location:
+      functest-xtesting: 838fc2ffe26f06cb11455145b7e73c452e85c15d
index b3be0d6..e5e237d 100755 (executable)
@@ -61,7 +61,7 @@ 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
+    docker cp -L fuel:/opt/kubernetes.config $dest_path
 else
     error "Installer $installer_type is not supported by this script"
 fi