diff options
| -rw-r--r-- | jjb/domino/domino-rtd-jobs.yaml | 13 | ||||
| -rw-r--r-- | jjb/domino/domino.yaml | 57 | ||||
| -rwxr-xr-x | jjb/escalator/escalator-basic.sh | 5 | ||||
| -rwxr-xr-x | jjb/escalator/escalator-build.sh | 33 | ||||
| -rw-r--r-- | jjb/escalator/escalator-rtd-jobs.yaml | 13 | ||||
| -rwxr-xr-x | jjb/escalator/escalator-upload-artifact.sh | 89 | ||||
| -rw-r--r-- | jjb/escalator/escalator.yaml | 317 | ||||
| -rw-r--r-- | jjb/opnfvdocs/project.cfg | 41 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yaml | 3 | ||||
| -rw-r--r-- | jjb/vnf_forwarding_graph/vnf-forwarding-graph-rtd-jobs.yaml | 13 | ||||
| -rw-r--r-- | jjb/vnf_forwarding_graph/vnf_forwarding_graph.yaml | 8 |
11 files changed, 0 insertions, 592 deletions
diff --git a/jjb/domino/domino-rtd-jobs.yaml b/jjb/domino/domino-rtd-jobs.yaml deleted file mode 100644 index 26f254760..000000000 --- a/jjb/domino/domino-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: domino-rtd - project: domino - project-name: domino - - gerrit-skip-vote: true - project-pattern: 'domino' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-domino/47363/' - rtd-token: 'c89c7fc281d94a985df61b49be2b824f544ba6fd' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/domino/domino.yaml b/jjb/domino/domino.yaml deleted file mode 100644 index e91260463..000000000 --- a/jjb/domino/domino.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -- project: - name: domino - - project: '{name}' - - jobs: - - 'domino-verify-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - -- job-template: - name: 'domino-verify-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm-gerrit - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - 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}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' - - builders: - - shell: | - #!/bin/bash - ./tests/run.sh diff --git a/jjb/escalator/escalator-basic.sh b/jjb/escalator/escalator-basic.sh deleted file mode 100755 index 9c739c422..000000000 --- a/jjb/escalator/escalator-basic.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -echo "--------------------------------------------------------" -echo "This is escalator basic job!" -echo "--------------------------------------------------------" - diff --git a/jjb/escalator/escalator-build.sh b/jjb/escalator/escalator-build.sh deleted file mode 100755 index 0e35c27d9..000000000 --- a/jjb/escalator/escalator-build.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -echo "--------------------------------------------------------" -echo "This is escalator build job!" -echo "--------------------------------------------------------" - -# set OPNFV_ARTIFACT_VERSION -if [[ "$JOB_NAME" =~ "merge" ]]; then - echo "Building Escalator TAR for a merged change" - export OPNFV_ARTIFACT_VERSION="gerrit-$GERRIT_CHANGE_NUMBER" -else - export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") -fi - -# build output directory -OUTPUT_DIR=$WORKSPACE/build_output -mkdir -p $OUTPUT_DIR - -# start the build -cd $WORKSPACE -./ci/build.sh $OUTPUT_DIR $OPNFV_ARTIFACT_VERSION - -# save information regarding artifact into file -( - echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION" - echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)" - echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" - echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin" - echo "OPNFV_BUILD_URL=$BUILD_URL" -) > $WORKSPACE/opnfv.properties - -echo -echo "--------------------------------------------------------" -echo "Done!" diff --git a/jjb/escalator/escalator-rtd-jobs.yaml b/jjb/escalator/escalator-rtd-jobs.yaml deleted file mode 100644 index 762051c96..000000000 --- a/jjb/escalator/escalator-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: escalator-rtd - project: escalator - project-name: escalator - - gerrit-skip-vote: true - project-pattern: 'escalator' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-escalator/47365/' - rtd-token: 'cb75c70dab564cb40e6d9e8f2a99ced96f5b79b1' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/escalator/escalator-upload-artifact.sh b/jjb/escalator/escalator-upload-artifact.sh deleted file mode 100755 index 781fb3e3e..000000000 --- a/jjb/escalator/escalator-upload-artifact.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash -echo "--------------------------------------------------------" -echo "This is escalator upload job!" -echo "--------------------------------------------------------" - -set -o pipefail - -# check if we built something -if [ -f $WORKSPACE/.noupload ]; then - echo "Nothing new to upload. Exiting." - /bin/rm -f $WORKSPACE/.noupload - exit 0 -fi - -# source the opnfv.properties to get ARTIFACT_VERSION -source $WORKSPACE/opnfv.properties - -importkey () { -# clone releng repository -echo "Cloning releng repository..." -[ -d releng ] && rm -rf releng -git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng/ &> /dev/null -#this is where we import the siging key -if [ -f $WORKSPACE/releng/utils/gpg_import_key.sh ]; then - source $WORKSPACE/releng/utils/gpg_import_key.sh -fi -} - -signtar () { -gpg2 -vvv --batch --yes --no-tty \ - --default-key opnfv-helpdesk@rt.linuxfoundation.org \ - --passphrase besteffort \ - --detach-sig $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz - -gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz.sig -echo "TAR signature Upload Complete!" -} - -uploadtar () { -# log info to console -echo "Uploading $INSTALLER_TYPE artifact. This could take some time..." -echo - -cd $WORKSPACE -# upload artifact and additional files to google storage -gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz \ - gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz > gsutil.tar.log 2>&1 -gsutil cp $WORKSPACE/opnfv.properties \ - gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 -if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then - gsutil cp $WORKSPACE/opnfv.properties \ - gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 -elif [[ "$JOB_NAME" =~ "merge" ]]; then - echo "Uploaded Escalator TAR for a merged change" -fi - -gsutil -m setmeta \ - -h "Content-Type:text/html" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://$GS_URL/latest.properties \ - gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > /dev/null 2>&1 - -gsutil -m setmeta \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz > /dev/null 2>&1 - -# disabled errexit due to gsutil setmeta complaints -# BadRequestException: 400 Invalid argument -# check if we uploaded the file successfully to see if things are fine -gsutil ls gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz > /dev/null 2>&1 -if [[ $? -ne 0 ]]; then - echo "Problem while uploading artifact!" - echo "Check log $WORKSPACE/gsutil.bin.log on the machine where this build is done." - exit 1 -fi - -echo "Done!" -echo -echo "--------------------------------------------------------" -echo -echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz" -echo -echo "--------------------------------------------------------" -echo -} - -importkey -signtar -uploadtar diff --git a/jjb/escalator/escalator.yaml b/jjb/escalator/escalator.yaml deleted file mode 100644 index d203dc113..000000000 --- a/jjb/escalator/escalator.yaml +++ /dev/null @@ -1,317 +0,0 @@ ---- -- project: - name: 'escalator' - - project: 'escalator' - - ##################################### - # branch definitions - ##################################### - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - ##################################### - # phases - ##################################### - phase: - - 'basic': - slave-label: 'opnfv-build-centos' - - 'build': - slave-label: 'opnfv-build-centos' - - ##################################### - # jobs - ##################################### - jobs: - - 'escalator-verify-{stream}' - - 'escalator-verify-{phase}-{stream}' - - 'escalator-merge-{stream}' - - 'escalator-merge-{phase}-{stream}' - -##################################### -# job templates -##################################### -- job-template: - name: 'escalator-verify-{stream}' - - project-type: multijob - - disabled: false - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - option: 'project' - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - 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}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' - readable-message: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-defaults' - - 'escalator-defaults': - gs-pathname: '{gs-pathname}' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: basic - condition: SUCCESSFUL - projects: - - name: 'escalator-verify-basic-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'escalator-verify-build-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - -- job-template: - name: 'escalator-verify-{phase}-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{slave-label}-defaults' - - 'escalator-defaults': - gs-pathname: '{gs-pathname}' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - '{project}-verify-{phase}-macro' - -- job-template: - name: 'escalator-merge-{stream}' - - project-type: multijob - - disabled: false - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - option: 'project' - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' - readable-message: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-defaults' - - 'escalator-defaults': - gs-pathname: '{gs-pathname}' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: basic - condition: SUCCESSFUL - projects: - - name: 'escalator-merge-basic-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'escalator-merge-build-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - -- job-template: - name: 'escalator-merge-{phase}-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - scm: - - git-scm - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{slave-label}-defaults' - - 'escalator-defaults': - gs-pathname: '{gs-pathname}' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - '{project}-merge-{phase}-macro' - -##################################### -# builder macros -##################################### -- builder: - name: 'escalator-verify-basic-macro' - builders: - - shell: - !include-raw: ./escalator-basic.sh - -- builder: - name: 'escalator-verify-build-macro' - builders: - - shell: - !include-raw: ./escalator-build.sh - -- builder: - name: 'escalator-merge-basic-macro' - builders: - - shell: - !include-raw: ./escalator-basic.sh - -# yamllint disable rule:indentation -- builder: - name: 'escalator-merge-build-macro' - builders: - - shell: - !include-raw: - - ./escalator-build.sh - - ./escalator-upload-artifact.sh -# yamllint enable rule:indentation - -##################################### -# parameter macros -##################################### -- parameter: - name: 'escalator-defaults' - parameters: - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - - string: - name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/$INSTALLER_TYPE - description: "Directory where the cache to be used during the build is located." - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." diff --git a/jjb/opnfvdocs/project.cfg b/jjb/opnfvdocs/project.cfg deleted file mode 100644 index d5ef6e6f7..000000000 --- a/jjb/opnfvdocs/project.cfg +++ /dev/null @@ -1,41 +0,0 @@ -apex -armband -availability -bottlenecks -clover -compass4nfv -conductor -container4nfv -daisy -doctor -domino -dovetail -dpacc -escalator -fastpathmetrics -fuel -functest -genesisreq -ipv6 -joid -kvmfornfv -lsoapi -moon -movie -multisite -octopus -onosfw -ovno -ovsnfv -parser -pharos -policytest -prediction -promise -qtip -sdnvpn -sfc -storperf -vnf_forwarding_graph -vswitchperf -yardstick diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index c41b25253..b9f8693c9 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -409,9 +409,6 @@ - 'daisy': dockerrepo: 'daisy' <<: *master - - 'escalator': - dockerrepo: 'escalator' - <<: *master jobs: - '{project}-docker-build-push-monitor-{stream}' diff --git a/jjb/vnf_forwarding_graph/vnf-forwarding-graph-rtd-jobs.yaml b/jjb/vnf_forwarding_graph/vnf-forwarding-graph-rtd-jobs.yaml deleted file mode 100644 index 69895d101..000000000 --- a/jjb/vnf_forwarding_graph/vnf-forwarding-graph-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: vnf-forwarding-graph-rtd - project: vnf-forwarding-graph - project-name: vnf-forwarding-graph - - gerrit-skip-vote: true - project-pattern: 'vnf-forwarding-graph' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-vnf-forwarding-graph/47397/' - rtd-token: '5c6fd3d0f49fb88ea4230d6666d94b59fef86e7f' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yaml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yaml deleted file mode 100644 index b11c20f62..000000000 --- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- project: - name: vnf_forwarding_graph - - project: '{name}' - - jobs: - - '{project}-verify-basic' |