diff options
Diffstat (limited to 'jjb/functest')
-rwxr-xr-x | jjb/functest/functest-alpine.sh | 15 | ||||
-rw-r--r-- | jjb/functest/functest-daily-jobs.yml | 4 | ||||
-rw-r--r-- | jjb/functest/functest-docker.yml | 9 | ||||
-rwxr-xr-x | jjb/functest/functest-env-presetup.sh | 2 | ||||
-rw-r--r-- | jjb/functest/functest-kubernetes-docker.yml | 174 | ||||
-rw-r--r-- | jjb/functest/functest-weekly-jobs.yml | 8 |
6 files changed, 194 insertions, 18 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index dfadf9a37..72b94bd18 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -28,12 +28,12 @@ check_os_deployment() { run_tiers() { tiers=$1 - if [[ ${BRANCH##*/} == "master" ]]; then - cmd_opt="run_tests -r -t all" - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all" - else + if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then cmd_opt="prepare_env start && run_tests -r -t all" [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all" + else + cmd_opt="run_tests -r -t all" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all" fi ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -58,10 +58,10 @@ run_tiers() { run_test() { test_name=$1 - if [[ ${BRANCH##*/} == "master" ]]; then - cmd_opt="run_tests -t ${test_name}" - else + if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then cmd_opt="prepare_env start && run_tests -t ${test_name}" + else + cmd_opt="run_tests -t ${test_name}" fi ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -177,7 +177,6 @@ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_ set +e -[[ ${BRANCH##*/} == "master" ]] && check_os_deployment if [ ${FUNCTEST_MODE} == 'testcase' ]; then echo "FUNCTEST_MODE=testcase, FUNCTEST_SUITE_NAME=${FUNCTEST_SUITE_NAME}" run_test ${FUNCTEST_SUITE_NAME} diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index 8ffbe9e63..b93a56bad 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -14,6 +14,10 @@ stream: master branch: '{stream}' gs-pathname: '' + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' euphrates: &euphrates stream: euphrates branch: 'stable/{stream}' diff --git a/jjb/functest/functest-docker.yml b/jjb/functest/functest-docker.yml index 909c7b079..50c7c3816 100644 --- a/jjb/functest/functest-docker.yml +++ b/jjb/functest/functest-docker.yml @@ -12,7 +12,7 @@ - master: branch: '{stream}' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' disabled: false @@ -31,7 +31,6 @@ - 'parser' - 'smoke' - 'vnf' - - 'restapi' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -136,10 +135,6 @@ <<: *build-job-settings - name: 'functest-vnf-docker-build-arm64-{stream}' <<: *build-job-settings - - name: 'functest-restapi-docker-build-amd64-{stream}' - <<: *build-job-settings - - name: 'functest-restapi-docker-build-arm64-{stream}' - <<: *build-job-settings - multijob: name: 'publish all manifests' condition: SUCCESSFUL @@ -157,8 +152,6 @@ <<: *manifest-job-settings - name: 'functest-vnf-docker-manifest-{stream}' <<: *manifest-job-settings - - name: 'functest-restapi-docker-manifest-{stream}' - <<: *manifest-job-settings publishers: - 'functest-amd64-recipients' diff --git a/jjb/functest/functest-env-presetup.sh b/jjb/functest/functest-env-presetup.sh index 4738121de..323b325b4 100755 --- a/jjb/functest/functest-env-presetup.sh +++ b/jjb/functest/functest-env-presetup.sh @@ -49,7 +49,7 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then if [[ ! "${BRANCH}" =~ "danube" ]]; then echo "Map mcp ssh_key" - export sshkey_vol="-v ${SSH_KEY}:/root/.ssh/id_rsa" + export sshkey_vol="-v ${SSH_KEY:-/var/lib/opnfv/mcp.rsa}:/root/.ssh/id_rsa" fi fi diff --git a/jjb/functest/functest-kubernetes-docker.yml b/jjb/functest/functest-kubernetes-docker.yml new file mode 100644 index 000000000..de1895dce --- /dev/null +++ b/jjb/functest/functest-kubernetes-docker.yml @@ -0,0 +1,174 @@ +--- +############################################## +# job configuration for docker build and push +############################################## +- project: + + name: functest-kubernetes-docker + + project: functest-kubernetes + + stream: + - master: + branch: '{stream}' + disabled: false + - fraser: + branch: 'stable/{stream}' + disabled: false + + arch_tag: + - 'amd64': + slave_label: 'opnfv-build-ubuntu' + + # yamllint disable rule:key-duplicates + image: + - 'core' + + # settings for jobs run in multijob phases + build-job-settings: &build-job-settings + current-parameters: false + git-revision: true + node-parameters: false + predefined-parameters: | + PUSH_IMAGE=$PUSH_IMAGE + COMMIT_ID=$COMMIT_ID + GERRIT_REFNAME=$GERRIT_REFNAME + DOCKERFILE=$DOCKERFILE + kill-phase-on: FAILURE + abort-all-jobs: false + + manifest-job-settings: &manifest-job-settings + current-parameters: false + git-revision: true + node-parameters: false + predefined-parameters: + GERRIT_REFNAME=$GERRIT_REFNAME + kill-phase-on: FAILURE + abort-all-jobs: false + + # yamllint enable rule:key-duplicates + jobs: + - "functest-kubernetes-docker-{stream}" + - "functest-kubernetes-{image}-docker-build-{arch_tag}-{stream}" + +######################## +# job templates +######################## +- job-template: + name: 'functest-kubernetes-docker-{stream}' + + project-type: multijob + + disabled: '{obj:disabled}' + + parameters: + - functest-kubernetes-job-parameters: + project: '{project}' + branch: '{branch}' + slave_label: 'opnfv-build-ubuntu' + arch_tag: 'amd64' + + properties: + - throttle: + max-per-node: 1 + option: 'project' + + scm: + - git-scm + + triggers: + - pollscm: + cron: "*/30 * * * *" + - gerrit-trigger-tag-created: + project: '{project}' + + builders: + - multijob: + name: 'build functest-kubernetes-core images' + execution-type: PARALLEL + projects: + - name: 'functest-kubernetes-core-docker-build-amd64-{stream}' + <<: *build-job-settings + + publishers: + - 'functest-kubernetes-amd64-recipients' + +- job-template: + name: 'functest-kubernetes-{image}-docker-build-{arch_tag}-{stream}' + disabled: '{obj:disabled}' + parameters: + - functest-kubernetes-job-parameters: + project: '{project}' + branch: '{branch}' + slave_label: '{slave_label}' + arch_tag: '{arch_tag}' + scm: + - git-scm + 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" + exit $? + +# parameter macro +- parameter: + name: functest-kubernetes-job-parameters + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - label: + name: SLAVE_LABEL + default: '{slave_label}' + description: 'Slave label on Jenkins' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: PUSH_IMAGE + default: "true" + description: "To enable/disable pushing the image to Dockerhub." + - string: + name: COMMIT_ID + default: "" + description: "commit id to make a snapshot docker image" + - string: + name: GERRIT_REFNAME + default: "" + description: "Docker tag to be built, e.g. refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/5.0.RC1" + - string: + name: DOCKERFILE + default: "Dockerfile" + description: "Dockerfile to use for creating the image." + - string: + name: ARCH_TAG + default: "{arch_tag}" + description: "If set, this value will be added to the docker image tag as a prefix" + - string: + name: PROJECT + default: "{project}" + description: "Project name used to enable job conditions" + - string: + name: REPO + default: "opnfv" + description: "Repository name for functest images" + +- publisher: + name: 'functest-kubernetes-amd64-recipients' + publishers: + - email: + recipients: > + jalausuch@suse.com morgan.richomme@orange.com + cedric.ollivier@orange.com feng.xiaowei@zte.com.cn + juha.kosonen@nokia.com wangwulin@huawei.com + valentin.boucher@kontron.com diff --git a/jjb/functest/functest-weekly-jobs.yml b/jjb/functest/functest-weekly-jobs.yml index 5d572aacc..d87ac2f76 100644 --- a/jjb/functest/functest-weekly-jobs.yml +++ b/jjb/functest/functest-weekly-jobs.yml @@ -16,11 +16,17 @@ gs-pathname: '' docker-tag: 'latest' disabled: false + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + docker-tag: '{stream}' + disabled: false euphrates: &euphrates stream: euphrates branch: 'stable/{stream}' gs-pathname: '/{stream}' - docker-tag: 'stable' + docker-tag: '{stream}' disabled: false # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING |