diff options
Diffstat (limited to 'jjb/xci')
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yml | 23 | ||||
| -rwxr-xr-x | jjb/xci/xci-functest.sh | 3 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 24 |
3 files changed, 39 insertions, 11 deletions
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml index c39d07e39..0835e6709 100644 --- a/jjb/xci/xci-daily-jobs.yml +++ b/jjb/xci/xci-daily-jobs.yml @@ -214,7 +214,13 @@ - string: name: XCI_LOOP default: 'daily' - + - string: + name: INSTALLER_TYPE + default: 'osa' + - string: + name: FUNCTEST_SUITE_NAME + default: 'daily' + description: "Daily suite name to run" builders: - description-setter: description: "Built on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" @@ -232,5 +238,16 @@ - builder: name: xci-functest-builder builders: - - shell: - !include-raw: ./xci-functest.sh + - shell: | + #!/bin/bash + + echo "Hello World!" + +# this will be enabled once the xci is prepared +#- builder: +# name: xci-functest-builder +# builders: +# - shell: +# !include-raw: +# - ../../utils/fetch_os_creds.sh +# - ../functest/functest-alpine.sh diff --git a/jjb/xci/xci-functest.sh b/jjb/xci/xci-functest.sh deleted file mode 100755 index 0f58dfefc..000000000 --- a/jjb/xci/xci-functest.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "Functional testing with functest" diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 39bdb8fc9..2cdecb208 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -87,15 +87,16 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'xci/**' - disable-strict-forbidden-file-verification: 'true' + disable-strict-forbidden-file-verification: 'false' forbidden-file-paths: - compare-type: ANT pattern: 'bifrost/**' - compare-type: ANT - pattern: 'README.rst' + pattern: 'prototypes/**' + - compare-type: ANT + pattern: 'upstream/**' + - compare-type: ANT + pattern: '**/README.rst' readable-message: true parameters: @@ -179,6 +180,9 @@ name: ANSIBLE_VERBOSITY default: '-vvvv' - string: + name: INSTALLER_TYPE + default: 'osa' + - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' @@ -213,6 +217,7 @@ cd $WORKSPACE/xci ./xci-deploy.sh + - builder: name: 'xci-verify-healthcheck-macro' builders: @@ -220,3 +225,12 @@ #!/bin/bash echo "Hello World!" + +# this will be enabled once the xci is prepared +#- builder: +# name: 'xci-verify-healthcheck-macro' +# builders: +# - shell: +# !include-raw: ../../utils/fetch_os_creds.sh +# - shell: +# !include-raw: ../functest/functest-alpine.sh |