diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/apex/apex-upload-artifact.sh | 6 | ||||
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 6 | ||||
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 16 | ||||
| -rw-r--r-- | jjb/opnfv/test-sign.yml | 42 | ||||
| -rw-r--r-- | jjb/sandbox/sandbox-verify-jobs.yml | 280 |
5 files changed, 347 insertions, 3 deletions
diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh index 49e19bb12..d45c7c01b 100755 --- a/jjb/apex/apex-upload-artifact.sh +++ b/jjb/apex/apex-upload-artifact.sh @@ -23,8 +23,8 @@ fi signrpm () { for artifact in $RPM_LIST $SRPM_LIST; do echo "Signing artifact: ${artifact}" - gpg2 -vvv --batch \ - --default-key opnfv-helpdesk@rt.linuxfoundation.org \ + gpg2 -vvv --batch --yes --no-tty \ + --default-key opnfv-helpdesk@rt.linuxfoundation.org \ --passphrase besteffort \ --detach-sig $artifact gsutil cp "$artifact".sig gs://$GS_URL/$(basename "$artifact".sig) @@ -33,7 +33,7 @@ done } signiso () { -time gpg2 -vvv --batch \ +time gpg2 -vvv --batch --yes --no-tty \ --default-key opnfv-helpdesk@rt.linuxfoundation.org \ --passphrase notreallysecure \ --detach-sig $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 53c652eaf..ba02af8d6 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -36,8 +36,14 @@ #-------------------------------- scenario: # HA scenarios + - 'os-nosdn-nofeature-ha': + auto-trigger-name: 'daily-trigger-disabled' - 'os-odl_l2-nofeature-ha': auto-trigger-name: 'armband-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l3-nofeature-ha': + auto-trigger-name: 'daily-trigger-disabled' + - 'os-odl_l2-bgpvpn-ha': + auto-trigger-name: 'daily-trigger-disabled' # NOHA scenarios - 'os-odl_l2-nofeature-noha': diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index f95d79f93..60fee9263 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -93,3 +93,19 @@ name: CPU_ARCHITECTURE default: 'amd64' description: "CPU Architecture to use for Ubuntu distro " + +- parameter: + name: 'sandbox-defaults' + parameters: + - string: + name: INSTALLER_IP + default: '10.20.0.2' + description: 'IP of the installer' + - string: + name: INSTALLER_TYPE + default: sandbox + description: 'Installer used for deploying OPNFV on this POD' + - string: + name: EXTERNAL_NETWORK + default: 'admin_floating_net' + description: 'external network for test' diff --git a/jjb/opnfv/test-sign.yml b/jjb/opnfv/test-sign.yml new file mode 100644 index 000000000..b27d75777 --- /dev/null +++ b/jjb/opnfv/test-sign.yml @@ -0,0 +1,42 @@ +- project: + name: test-sign + + project: 'releng' + + jobs: + - 'test-sign-daily-{stream}' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + + +- job-template: + name: 'test-sign-daily-{stream}' + + # Job template for daily builders + # + # Required Variables: + # stream: branch with - in place of / (eg. stable) + # branch: branch (eg. stable) + node: master + + disabled: false + + parameters: + - project-parameter: + project: '{project}' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + triggers: + - timed: 'H H * * *' + + builders: + - shell: | + $WORKSPACE/utils/test-sign-artifact.sh diff --git a/jjb/sandbox/sandbox-verify-jobs.yml b/jjb/sandbox/sandbox-verify-jobs.yml new file mode 100644 index 000000000..b1e8e93cd --- /dev/null +++ b/jjb/sandbox/sandbox-verify-jobs.yml @@ -0,0 +1,280 @@ +- project: + name: 'sandbox-verify-jobs' + + project: 'sandbox' + + installer: 'sandbox' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + +# what are the verification activities we do for this installer + activity: + - 'basic' + - 'build' + - 'deploy' + - 'test' + + jobs: + - 'sandbox-verify-{stream}' + - 'sandbox-verify-{activity}-{stream}' + +- job-template: + name: 'sandbox-verify-{stream}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - timeout: + timeout: 360 + fail: true + + triggers: + - gerrit: + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**|.gitignore' + readable-message: true + + builders: + - description-setter: + description: "POD: $NODE_NAME" + - '{project}-verify-builder' + - trigger-builds: + - project: 'sandbox-verify-basic-{stream}' + block: true + - trigger-builds: + - project: 'sandbox-verify-build-{stream}' + block: true + - trigger-builds: + - project: 'sandbox-verify-deploy-{stream}' + block: true + - trigger-builds: + - project: 'sandbox-verify-test-{stream}' + block: true + +- job-template: + name: 'sandbox-verify-{activity}-{stream}' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - timeout: + timeout: 360 + fail: true + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - '{installer}-defaults' + - '{project}-verify-{activity}-parameter' + + builders: + - description-setter: + description: "POD: $NODE_NAME" + - '{project}-verify-{activity}-builder' + +##################################### +# parameter builders +##################################### +- parameter: + name: 'sandbox-verify-basic-parameter' + parameters: + - 'opnfv-build-ubuntu-defaults' + +- parameter: + name: 'sandbox-verify-build-parameter' + parameters: + - 'opnfv-build-ubuntu-defaults' + +- parameter: + name: 'sandbox-verify-deploy-parameter' + parameters: + - 'opnfv-build-centos-defaults' + +- parameter: + name: 'sandbox-verify-test-parameter' + parameters: + - 'opnfv-build-centos-defaults' +##################################### +# builder builders +##################################### +- builder: + name: 'sandbox-verify-builder' + builders: + - shell: | + #!/bin/bash + + # this is the builder for the parent/upstream job which we do nothing + 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' + builders: + - shell: | + #!/bin/bash + + # this is where we check the commit message, unit test, etc. + 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' + builders: + - shell: | + #!/bin/bash + + # this is where we do the build + 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' + builders: + - shell: | + #!/bin/bash + + # this is where we start the virtual deployment + 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' + builders: + - shell: | + #!/bin/bash + + # this is where we do functest smoketest + 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 "-------------------------------------" |