From b63d8b8465dd3ba0e94bcf8d0628168e76849f43 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 1 Dec 2017 21:20:05 +0000 Subject: [PATCH 1/2] Remove fancy github context notifiers They don't function correctly and they're not worth it Signed-off-by: Eli Uriegas Upstream-commit: 3f5a6f288ad7e134abb4ac99e56cbbca17bfae88 Component: packaging --- components/packaging/Jenkinsfile | 70 ++++++++++++++------------------ 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/components/packaging/Jenkinsfile b/components/packaging/Jenkinsfile index bfbf1e8a48..259afa2b14 100644 --- a/components/packaging/Jenkinsfile +++ b/components/packaging/Jenkinsfile @@ -1,46 +1,36 @@ #!groovy -def stageWithGithubNotify(String name, Closure cl) { - def notify = { String status -> - safeGithubNotify([context: name, targetUrl: "${BUILD_URL}/flowGraphTable"] + [status: status]) - } - - stage(name) { - notify 'PENDING' - try { - cl() - } catch (err) { - addFailedStage(name) - notify 'FAILURE' - throw err - } - notify 'SUCCESS' - } -} - -parallel { - stageWithGithubNotify('Ubuntu Xenial Debian Package') { - wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { - checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=moby CLI_DIR=cli deb") +test_steps = [ + 'deb': { -> + stage('Ubuntu Xenial Debian Package') { + wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + checkout scm + sh("git clone https://github.com/docker/cli.git") + sh("git clone https://github.com/moby/moby.git") + sh("make DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=moby CLI_DIR=cli deb") + } } }, - stageWithGithubNotify('Centos 7 RPM Package') { - wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { - checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=moby CLI_DIR=cli rpm") + 'rpm': { -> + stage('Centos 7 RPM Package') { + wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + checkout scm + sh("git clone https://github.com/docker/cli.git") + sh("git clone https://github.com/moby/moby.git") + sh("make DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=moby CLI_DIR=cli rpm") + } } - } - stageWithGithubNotify('Static Linux Binaries') { - wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { - checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=moby CLI_DIR=cli static") + }, + 'static': { -> + stage('Static Linux Binaries') { + wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + checkout scm + sh("git clone https://github.com/docker/cli.git") + sh("git clone https://github.com/moby/moby.git") + sh("make DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=moby CLI_DIR=cli static") + } } - } -} + }, +] + +parallel(test_steps) From 3cd9275696bbf0bf7a54a45bb7f9e41504b3fc10 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 1 Dec 2017 21:50:35 +0000 Subject: [PATCH 2/2] Make directory references absolute Signed-off-by: Eli Uriegas Upstream-commit: bca63242a9c166a944619019da6e0b50f03b4233 Component: packaging --- components/packaging/Jenkinsfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components/packaging/Jenkinsfile b/components/packaging/Jenkinsfile index 259afa2b14..89ed953ad5 100644 --- a/components/packaging/Jenkinsfile +++ b/components/packaging/Jenkinsfile @@ -5,9 +5,9 @@ test_steps = [ stage('Ubuntu Xenial Debian Package') { wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=moby CLI_DIR=cli deb") + sh('git clone https://github.com/docker/cli.git') + sh('git clone https://github.com/moby/moby.git') + sh('make DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli deb') } } }, @@ -15,9 +15,9 @@ test_steps = [ stage('Centos 7 RPM Package') { wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=moby CLI_DIR=cli rpm") + sh('git clone https://github.com/docker/cli.git') + sh('git clone https://github.com/moby/moby.git') + sh('make DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli rpm') } } }, @@ -25,9 +25,9 @@ test_steps = [ stage('Static Linux Binaries') { wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=moby CLI_DIR=cli static") + sh('git clone https://github.com/docker/cli.git') + sh('git clone https://github.com/moby/moby.git') + sh('make DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli static') } } },