From 0c5eb1da8d987a0891f9d4f902a2c500096fd8ee Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 7 Jul 2016 11:45:01 +0200 Subject: sandbox: Remove duplicate scm configuration Change-Id: Iba18750ae19c5d30078d600abcd6b687543204c5 Signed-off-by: Fatih Degirmenci --- jjb/sandbox/sandbox-verify-jobs.yml | 134 ++++++++++++++++++++++++++++-------- 1 file changed, 105 insertions(+), 29 deletions(-) diff --git a/jjb/sandbox/sandbox-verify-jobs.yml b/jjb/sandbox/sandbox-verify-jobs.yml index ee9f76324..b1e8e93cd 100644 --- a/jjb/sandbox/sandbox-verify-jobs.yml +++ b/jjb/sandbox/sandbox-verify-jobs.yml @@ -31,12 +31,6 @@ branch: '{branch}' - 'opnfv-build-ubuntu-defaults' - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - wrappers: - ssh-agent-credentials: users: @@ -74,28 +68,16 @@ - '{project}-verify-builder' - trigger-builds: - project: 'sandbox-verify-basic-{stream}' - current-parameters: true - same-node: true - git-revision: true block: true - trigger-builds: - project: 'sandbox-verify-build-{stream}' - current-parameters: false block: true - git-revision: true - same-node: true - trigger-builds: - project: 'sandbox-verify-deploy-{stream}' - current-parameters: false block: true - git-revision: true - same-node: false - trigger-builds: - project: 'sandbox-verify-test-{stream}' - current-parameters: false block: true - git-revision: true - same-node: false - job-template: name: 'sandbox-verify-{activity}-{stream}' @@ -122,12 +104,6 @@ - '{installer}-defaults' - '{project}-verify-{activity}-parameter' - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - builders: - description-setter: description: "POD: $NODE_NAME" @@ -165,7 +141,27 @@ #!/bin/bash # this is the builder for the parent/upstream job which we do nothing - echo "Hello World" + cd $WORKSPACE + echo + echo "Commit Message is" + echo "-------------------------------------" + echo $GERRIT_CHANGE_COMMIT_MESSAGE + echo "-------------------------------------" + echo + echo "Repo contents" + echo "-------------------------------------" + ls -al + echo "-------------------------------------" + echo + echo "Changed files are" + echo "-------------------------------------" + git diff origin/master --name-only + echo "-------------------------------------" + echo + echo "Change introduced" + echo "-------------------------------------" + git diff origin/master + echo "-------------------------------------" - builder: name: 'sandbox-verify-basic-builder' @@ -174,7 +170,27 @@ #!/bin/bash # this is where we check the commit message, unit test, etc. - echo "Hello World" + cd $WORKSPACE + echo + echo "Commit Message is" + echo "-------------------------------------" + echo $GERRIT_CHANGE_COMMIT_MESSAGE + echo "-------------------------------------" + echo + echo "Repo contents" + echo "-------------------------------------" + ls -al + echo "-------------------------------------" + echo + echo "Changed files are" + echo "-------------------------------------" + git diff origin/master --name-only + echo "-------------------------------------" + echo + echo "Change introduced" + echo "-------------------------------------" + git diff origin/master + echo "-------------------------------------" - builder: name: 'sandbox-verify-build-builder' @@ -183,7 +199,27 @@ #!/bin/bash # this is where we do the build - echo "Hello World" + cd $WORKSPACE + echo + echo "Commit Message is" + echo "-------------------------------------" + echo $GERRIT_CHANGE_COMMIT_MESSAGE + echo "-------------------------------------" + echo + echo "Repo contents" + echo "-------------------------------------" + ls -al + echo "-------------------------------------" + echo + echo "Changed files are" + echo "-------------------------------------" + git diff origin/master --name-only + echo "-------------------------------------" + echo + echo "Change introduced" + echo "-------------------------------------" + git diff origin/master + echo "-------------------------------------" - builder: name: 'sandbox-verify-deploy-builder' @@ -192,7 +228,27 @@ #!/bin/bash # this is where we start the virtual deployment - echo "Hello World" + cd $WORKSPACE + echo + echo "Commit Message is" + echo "-------------------------------------" + echo $GERRIT_CHANGE_COMMIT_MESSAGE + echo "-------------------------------------" + echo + echo "Repo contents" + echo "-------------------------------------" + ls -al + echo "-------------------------------------" + echo + echo "Changed files are" + echo "-------------------------------------" + git diff origin/master --name-only + echo "-------------------------------------" + echo + echo "Change introduced" + echo "-------------------------------------" + git diff origin/master + echo "-------------------------------------" - builder: name: 'sandbox-verify-test-builder' @@ -201,4 +257,24 @@ #!/bin/bash # this is where we do functest smoketest - echo "Hello World" + cd $WORKSPACE + echo + echo "Commit Message is" + echo "-------------------------------------" + echo $GERRIT_CHANGE_COMMIT_MESSAGE + echo "-------------------------------------" + echo + echo "Repo contents" + echo "-------------------------------------" + ls -al + echo "-------------------------------------" + echo + echo "Changed files are" + echo "-------------------------------------" + git diff origin/master --name-only + echo "-------------------------------------" + echo + echo "Change introduced" + echo "-------------------------------------" + git diff origin/master + echo "-------------------------------------" -- cgit 1.2.3-korg