diff options
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/opnfv-docker.sh | 15 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.yml | 7 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 50 |
3 files changed, 15 insertions, 57 deletions
diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh index adb519394..4089a6ff3 100644 --- a/jjb/opnfv/opnfv-docker.sh +++ b/jjb/opnfv/opnfv-docker.sh @@ -94,11 +94,11 @@ echo "Tag version to be build and pushed: $DOCKER_TAG" # Start the build -echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG..." +echo "Building docker image: $DOCKER_REPO_NAME:latest" -docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG . -echo "Creating tag 'latest'..." -docker tag $DOCKER_REPO_NAME:$DOCKER_TAG $DOCKER_REPO_NAME:latest +docker build --no-cache -t $DOCKER_REPO_NAME:latest . +echo "Creating tag '$DOCKER_TAG'..." +docker tag -f $DOCKER_REPO_NAME:latest $DOCKER_REPO_NAME:$DOCKER_TAG # list the images echo "Available images are:" @@ -110,8 +110,9 @@ if [[ "$PUSH_IMAGE" == "true" ]]; then echo "--------------------------------------------------------" echo # Push to the Dockerhub repository - docker push $DOCKER_REPO_NAME:$DOCKER_TAG - - echo "Updating $DOCKER_REPO_NAME:latest to the docker registry..." + echo "Pushing $DOCKER_REPO_NAME:latest ..." docker push $DOCKER_REPO_NAME:latest + + echo "Pushing $DOCKER_REPO_NAME:$DOCKER_TAG ..." + docker push $DOCKER_REPO_NAME:$DOCKER_TAG fi diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml index c16e33eda..04dcf832f 100644 --- a/jjb/opnfv/opnfv-docker.yml +++ b/jjb/opnfv/opnfv-docker.yml @@ -27,17 +27,12 @@ - job-template: name: '{project}-docker-build-push-{stream}' - node: ericsson-build - disabled: false parameters: - project-parameter: project: '{project}' - - 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." + - 'ericsson-build-defaults' - string: name: PUSH_IMAGE default: "true" diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index daa4a4f1e..e1f9e448b 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -194,24 +194,6 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'ericsson-build-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - ericsson-build - default-slaves: - - ericsson-build - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' -- parameter: name: 'huawei-build-defaults' parameters: - node: @@ -267,15 +249,10 @@ - parameter: name: 'opnfv-build-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-us-build-1 - - ericsson-ca-build-1 - default-slaves: - - intel-us-build-1 - - ericsson-ca-build-1 + - label: + name: SLAVE_LABEL + default: 'opnfv-build' + description: 'Slave label on Jenkins' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -316,21 +293,6 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'ericsson-ca-build-1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - ericsson-ca-build-1 - default-slaves: - - ericsson-ca-build-1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: name: 'zte-build-1-defaults' parameters: - node: @@ -426,11 +388,11 @@ description: 'Git URL to use on these Jenkins Slaves' - parameter: - name: 'fuel-build-defaults' + name: 'ericsson-build-defaults' parameters: - label: name: SLAVE_LABEL - default: 'fuel-build' + default: 'ericsson-build' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT |