diff options
| -rw-r--r-- | jjb/opnfvdocs/docs-rtd.yaml | 3 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.sh | 10 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 2 | ||||
| -rw-r--r-- | utils/test/reporting/reporting/reporting.yaml | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index f81feab22..c98959524 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -8,7 +8,7 @@ stream: - master: branch: 'master' - - danube: + - euphrates: branch: 'stable/{stream}' project: 'opnfvdocs' @@ -73,7 +73,6 @@ project: '**' branch: '{branch}' files: 'docs/**/*.*' - - timed: 'H H * * *' builders: - shell: | diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh index 298d2af51..402099a91 100644 --- a/jjb/releng/opnfv-docker.sh +++ b/jjb/releng/opnfv-docker.sh @@ -78,8 +78,14 @@ BUILD_BRANCH=$BRANCH if [[ "$BRANCH" == "master" ]]; then DOCKER_TAG="latest" elif [[ -n "${RELEASE_VERSION-}" ]]; then - DOCKER_TAG=${BRANCH##*/}.${RELEASE_VERSION} - # e.g. danube.1.0, danube.2.0, danube.3.0 + DOCKER_TAG=${RELEASE_VERSION} + if git checkout ${RELEASE_VERSION}; then + echo "Successfully checked out the git tag ${RELEASE_VERSION}" + else + echo "The tag ${RELEASE_VERSION} doesn't exist in the repository. Existing tags are:" + git tag + exit 1 + fi else DOCKER_TAG="stable" fi diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index f0020aea3..862e77ac8 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -211,7 +211,7 @@ - string: name: RELEASE_VERSION default: "" - description: "Release version, e.g. 1.0, 2.0, 3.0" + description: "Docker tag to be built, e.g. 5.0.0, opnfv-5.0.0, 5.0.RC1" - string: name: DOCKERFILE default: "{dockerfile}" diff --git a/utils/test/reporting/reporting/reporting.yaml b/utils/test/reporting/reporting/reporting.yaml index ec5c2ef38..8123d0135 100644 --- a/utils/test/reporting/reporting/reporting.yaml +++ b/utils/test/reporting/reporting/reporting.yaml @@ -37,6 +37,8 @@ functest: blacklist: - odl_netvirt - juju_epc + - tempest_full_parallel + - rally_full max_scenario_criteria: 50 test_conf: https://git.opnfv.org/cgit/functest/plain/functest/ci/testcases.yaml log_level: ERROR |