You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ho...@apache.org on 2017/08/21 17:10:50 UTC
[incubator-openwhisk] branch master updated: remove nodes and clean
ansible/couchdb (#2655)
This is an automated email from the ASF dual-hosted git repository.
houshengbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new eeeb749 remove nodes and clean ansible/couchdb (#2655)
eeeb749 is described below
commit eeeb74971085ba47d1bcb5496c84747c907d0de1
Author: Carlos Santana <cs...@gmail.com>
AuthorDate: Mon Aug 21 13:10:47 2017 -0400
remove nodes and clean ansible/couchdb (#2655)
---
tools/jenkins/apache/dockerhub.groovy | 50 +++--------------------------------
1 file changed, 4 insertions(+), 46 deletions(-)
diff --git a/tools/jenkins/apache/dockerhub.groovy b/tools/jenkins/apache/dockerhub.groovy
index d99efa4..975e196 100644
--- a/tools/jenkins/apache/dockerhub.groovy
+++ b/tools/jenkins/apache/dockerhub.groovy
@@ -1,50 +1,12 @@
#!groovy
-node('xenial && !H22') {
+node('xenial&&!H21&&!H22&&!H11&&!ubuntu-eu3') {
sh "env"
sh "docker version"
sh "docker info"
- stage("Setup") {
- sh "pip install --user --upgrade pip"
- withEnv(['PATH+LOCAL_JENKINS=/home/jenkins/.local/bin']) {
- sh "pip install --user markupsafe"
- sh "pip install --user couchdb"
- sh "pip install --user ansible==2.3.0.0"
- sh "pip install --user requests==2.10.0"
- sh "pip install --user docker==2.2.1"
- sh "pip install --user httplib2==0.9.2"
- }
- checkout([$class: 'GitSCM',
- branches: [[name: '*/master']],
- doGenerateSubmoduleConfigurations: false,
- extensions: [
- [$class: 'CleanBeforeCheckout'],
- [$class: 'CloneOption', noTags: true, reference: '', shallow: true]
- ],
- submoduleCfg: [],
- userRemoteConfigs: [[url: 'https://github.com/apache/incubator-openwhisk.git']]
- ])
- }
+ checkout scm
- stage("CouchDB Snapshot") {
- withEnv(['PATH+LOCAL_JENKINS=/home/jenkins/.local/bin']) {
- sh "python --version"
- sh "ansible --version"
- sh "ansible-playbook --version"
- dir('ansible') {
- def ANSIBLE_CMD = "ansible-playbook -i environments/local"
- sh "$ANSIBLE_CMD setup.yml"
- sh "$ANSIBLE_CMD couchdb.yml"
- sh "$ANSIBLE_CMD initdb.yml"
- sh "$ANSIBLE_CMD wipe.yml"
- sh "docker commit couchdb openwhisk/couchdb-snapshot"
- sh "docker images | grep openwhisk"
- sh "$ANSIBLE_CMD couchdb.yml -e mode=clean"
- }
- }
- }
-
- stage("Deploy DockerHub") {
+ stage("Build and Deploy to DockerHub") {
def JAVA_JDK_8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
withEnv(["Path+JDK=$JAVA_JDK_8/bin","JAVA_HOME=$JAVA_JDK_8"]) {
withCredentials([usernamePassword(credentialsId: 'openwhisk_dockerhub', passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USER')]) {
@@ -55,16 +17,12 @@ node('xenial && !H22') {
def shortCommit = gitCommit.take(7)
sh "${PUSH_CMD} -PdockerImageTag=latest"
sh "${PUSH_CMD} -PdockerImageTag=${shortCommit}"
- sh "docker tag openwhisk/couchdb-snapshot openwhisk/couchdb-snapshot:latest"
- sh "docker tag openwhisk/couchdb-snapshot openwhisk/couchdb-snapshot:${shortCommit}"
- sh "docker push openwhisk/couchdb-snapshot"
-
}
}
stage("Clean") {
sh "docker images"
- sh 'docker rmi -f $(docker images | grep openwhisk | awk \'{print $3}\') || true'
+ sh 'docker rmi -f $(docker images -f "reference=openwhisk/*" -q) || true'
sh "docker images"
}
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].