diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/fuel/fuel.yml | 2 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.sh | 28 | ||||
| -rw-r--r-- | jjb/qtip/qtip.yml | 4 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick.yml | 32 |
4 files changed, 48 insertions, 18 deletions
diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml index b99bcc0d4..1f53454e3 100644 --- a/jjb/fuel/fuel.yml +++ b/jjb/fuel/fuel.yml @@ -336,7 +336,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-fuel-{stream}' + - project: 'yardstick-fuel-lf-{stream}' block: true block-thresholds: build-step-failure-threshold: 'never' diff --git a/jjb/functest/functest-docker.sh b/jjb/functest/functest-docker.sh index 4de70d459..54315cad1 100644 --- a/jjb/functest/functest-docker.sh +++ b/jjb/functest/functest-docker.sh @@ -15,7 +15,8 @@ DOCKER_IMAGE_NAME="opnfv/functest" cd $WORKSPACE git clone https://gerrit.opnfv.org/gerrit/releng -DOCKER_TAG=$($WORKSPACE/releng/utils/calculate_version.sh -t docker -n $DOCKER_IMAGE_NAME) +DOCKER_TAG=$($WORKSPACE/releng/utils/calculate_version.sh -t docker \ + -n $DOCKER_IMAGE_NAME) ret_val=$? if [ $ret_val -ne 0 ]; then @@ -25,23 +26,28 @@ else echo "Tag version to be build and pushed: $DOCKER_TAG" fi -# Remove previous running containers -echo "Removing existing $DOCKER_IMAGE_NAME containers..." +# Remove previous running containers if exist if [[ ! -z $(docker ps -a | grep $DOCKER_IMAGE_NAME) ]]; then - docker ps | grep $DOCKER_IMAGE_NAME | awk '{{print $1}}' | xargs docker stop &>/dev/null - docker ps -a | grep $DOCKER_IMAGE_NAME | awk '{{print $1}}' | xargs docker rm &>/dev/null + echo "Removing existing $DOCKER_IMAGE_NAME containers..." + docker ps | grep $DOCKER_IMAGE_NAME | awk '{{print $1}}' | xargs docker stop + docker ps -a | grep $DOCKER_IMAGE_NAME | awk '{{print $1}}' | xargs docker rm fi -# Remove existing images -echo "Removing existing $DOCKER_IMAGE_NAME images..." +# list the images +echo "Available images are:" +docker images + +# Remove existing images if exist if [[ ! -z $(docker images | grep $DOCKER_IMAGE_NAME) ]]; then - docker images | grep $DOCKER_IMAGE_NAME | awk '{{print $3}}' | xargs docker rmi &>/dev/null + echo "Removing existing $DOCKER_IMAGE_NAME images..." + docker images | grep $DOCKER_IMAGE_NAME | awk '{{print $3}}' \ + | xargs docker rmi -f fi # Start the build echo "Building of $DOCKER_IMAGE_NAME:$DOCKER_TAG..." -cd $WORKSPACE/functest/docker +cd $WORKSPACE/docker docker build -t $DOCKER_IMAGE_NAME:$DOCKER_TAG . echo "Creating tag 'latest'..." docker tag $DOCKER_IMAGE_NAME:$DOCKER_TAG $DOCKER_IMAGE_NAME:latest @@ -56,8 +62,8 @@ if [ "$PUSH_IMAGE" == "true" ]; then echo "--------------------------------------------------------" echo # Push to the Dockerhub repository - docker push -f $DOCKER_IMAGE_NAME:$DOCKER_TAG + docker push $DOCKER_IMAGE_NAME:$DOCKER_TAG echo "Updating $DOCKER_IMAGE_NAME:latest to the docker registry..." - docker push -f $DOCKER_IMAGE_NAME:latest + docker push $DOCKER_IMAGE_NAME:latest fi diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml index 4bef7c544..e87408885 100644 --- a/jjb/qtip/qtip.yml +++ b/jjb/qtip/qtip.yml @@ -289,7 +289,7 @@ builders: - shell: | #! /bin/bash - if [[ ! -f $HOME/opnfv-openrc.sh]]; then + if [[ ! -f $HOME/opnfv-openrc.sh ]]; then echo "Unable to access file $HOME/opnfv-openrc.sh" exit 1 fi @@ -305,7 +305,7 @@ builders: - shell: | #!/bin/bash - if [[ ! -f $HOME/opnfv-openrc.sh]]; then + if [[ ! -f $HOME/opnfv-openrc.sh ]]; then echo "Unable to access file $HOME/opnfv-openrc.sh" exit 1 fi diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml index 7c40096cd..60344fa11 100644 --- a/jjb/yardstick/yardstick.yml +++ b/jjb/yardstick/yardstick.yml @@ -171,6 +171,11 @@ parameters: - project-parameter: project: '{project}' + - '{pod}-parameters' + - string: + name: POD_NAME + default: '{pod}' + description: "POD where the job runs" - string: name: INSTALLER_TYPE default: '{installer_type}' @@ -242,14 +247,33 @@ !include-raw ../../utils/fetch_os_creds.sh ######################## +# parameter macros +######################## +- parameter: + name: 'ericsson-parameters' + parameters: + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW." + +- parameter: + name: 'lf-parameters' + parameters: + - string: + name: GIT_BASE + default: ssh://gerrit.opnfv.org:29418/$PROJECT + description: "URL for LF POD" + +######################## # trigger macros ######################## - trigger: - name: yardstick-trigger-ericsson + name: 'yardstick-trigger-ericsson' triggers: - timed: "@midnight" + - timed: '@midnight' - trigger: - name: yardstick-trigger-lf + name: 'yardstick-trigger-lf' triggers: - timed: "#@midnight" + - timed: '#@midnight' |