diff options
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/opnfv-docker.sh | 7 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 18 |
2 files changed, 6 insertions, 19 deletions
diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh index ef4738482..07198c608 100644 --- a/jjb/opnfv/opnfv-docker.sh +++ b/jjb/opnfv/opnfv-docker.sh @@ -110,7 +110,12 @@ echo "Tag version to be build and pushed: $DOCKER_TAG" # Start the build echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG" -docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG . +if [[ $DOCKER_REPO_NAME == *"functest"* ]]; then + docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG --build-arg BRANCH=$branch . +else + docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG . +fi + echo "Creating tag '$DOCKER_TAG'..." docker tag -f $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG $DOCKER_REPO_NAME:$DOCKER_TAG diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 0c8435d6e..c7ec6aa9d 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -604,24 +604,6 @@ default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - parameter: - name: 'arm-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - arm-pod1 - default-slaves: - - arm-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config - description: 'Base URI to the configuration directory' -- parameter: name: 'arm-pod2-defaults' parameters: - node: |