aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
Diffstat (limited to 'mcp')
-rwxr-xr-xmcp/config/states/openstack_ha20
1 files changed, 11 insertions, 9 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 0bbf7cde5..a035a8b2f 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -65,15 +65,17 @@ salt -I 'ceilometer:agent' state.sls ceilometer
salt -I 'horizon:server' state.sls horizon
salt -I 'nginx:server' state.sls nginx,sphinx
-# workaround for the pike horizon is missing css, FUEL-324
-salt -I 'horizon:server' file.symlink \
- /var/lib/openstack-dashboard/static \
- /usr/share/openstack-dashboard/static
-salt -I 'horizon:server' cmd.run "/usr/share/openstack-dashboard/manage.py collectstatic --noinput"
-salt -I 'horizon:server' cmd.run "/usr/share/openstack-dashboard/manage.py compress --force"
-salt -I 'horizon:server' file.append /etc/openstack-dashboard/local_settings.py \
- "AVAILABLE_THEMES = [ ('default', 'Default', 'themes/default'),]"
-salt -I 'horizon:server' service.reload apache2
+# workaround for Ubuntu Pike Horizon missing css, FUEL-324
+if ! salt -C 'I@horizon:server and *01*' --out=yaml pkg.version openstack-dashboard | grep -qE 'mcp'; then
+ salt -I 'horizon:server' file.symlink \
+ /var/lib/openstack-dashboard/static \
+ /usr/share/openstack-dashboard/static
+ salt -I 'horizon:server' cmd.run "/usr/share/openstack-dashboard/manage.py collectstatic --noinput"
+ salt -I 'horizon:server' cmd.run "/usr/share/openstack-dashboard/manage.py compress --force"
+ salt -I 'horizon:server' file.append /etc/openstack-dashboard/local_settings.py \
+ "AVAILABLE_THEMES = [ ('default', 'Default', 'themes/default'),]"
+ salt -I 'horizon:server' service.reload apache2
+fi
clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \
pillar.get _param:cluster_vip_address | awk '{print $2; exit}')
185 186 187 188 189 190 191 192 193 194 
- project:

    name: 'compass-dovetail-jobs'
    installer: 'compass'
    project: 'compass4nfv'
#----------------------------------
# BRANCH ANCHORS
#----------------------------------
    danube: &danube
        stream: danube
        branch: 'stable/{stream}'
        gs-pathname: '/{stream}'
        disabled: false
        dovetail-branch: master
#------------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#------------------------------------
#        CI PODs
#------------------------------------
    pod:
        - baremetal:
            slave-label: compass-baremetal
            os-version: 'xenial'
            <<: *danube
#-----------------------------------
# scenarios
#-----------------------------------
    scenario:
        - 'os-nosdn-nofeature-ha':
            disabled: true
            auto-trigger-name: 'compass-{scenario}-{pod}-weekly-{stream}-trigger'

    jobs:
        - 'compass-{scenario}-{pod}-weekly-{stream}'
        - 'compass-deploy-{pod}-weekly-{stream}'

########################
# job templates
########################
- job-template:
    name: 'compass-{scenario}-{pod}-weekly-{stream}'

    disabled: '{obj:disabled}'

    concurrent: false

    properties:
        - build-blocker:
            use-build-blocker: true
            blocking-jobs:
                - 'compass-os-.*?-{pod}-daily-.*?'
                - 'compass-os-.*?-{pod}-weekly-.*?'
            block-level: 'NODE'

    wrappers:
        - build-name:
            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
        - fix-workspace-permissions

    triggers:
        - '{auto-trigger-name}'

    parameters:
        - project-parameter:
            project: '{project}'
            branch: '{branch}'
        - compass-dovetail-parameter:
            installer: '{installer}'
            gs-pathname: '{gs-pathname}'
        - string:
            name: DEPLOY_SCENARIO
            default: '{scenario}'
        - '{slave-label}-defaults'
        - '{installer}-defaults'

    triggers:
        - '{auto-trigger-name}'

    builders:
        - description-setter:
            description: "POD: $NODE_NAME"
        - trigger-builds:
            - project: 'compass-deploy-{pod}-weekly-{stream}'
              current-parameters: false
              predefined-parameters: |
                DEPLOY_SCENARIO={scenario}
                COMPASS_OS_VERSION={os-version}
              same-node: true
              block: true
        - trigger-builds:
            - project: 'dovetail-compass-{pod}-compliance_set-weekly-{stream}'
              current-parameters: false
              predefined-parameters:
                DEPLOY_SCENARIO={scenario}
              block: true
              same-node: true
              block-thresholds:
                build-step-failure-threshold: 'never'
                failure-threshold: 'never'
                unstable-threshold: 'FAILURE'
        - trigger-builds:
            - project: 'dovetail-compass-{pod}-proposed_tests-weekly-{stream}'
              current-parameters: false
              predefined-parameters:
                DEPLOY_SCENARIO={scenario}
              block: true
              same-node: true
              block-thresholds:
                build-step-failure-threshold: 'never'
                failure-threshold: 'never'
                unstable-threshold: 'FAILURE'

- job-template:
    name: 'compass-deploy-{pod}-weekly-{stream}'

    disabled: false

    concurrent: true

    properties:
        - logrotate-default
        - throttle:
            enabled: true
            max-total: 4
            max-per-node: 1
            option: 'project'
        - build-blocker:
            use-build-blocker: true
            blocking-jobs:
                - 'compass-deploy-{pod}-daily-.*?'
                - 'compass-deploy-{pod}-weekly-.*'
                - 'compass-verify-deploy-.*?'
            block-level: 'NODE'

    wrappers:
        - build-name:
            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
        - timeout:
            timeout: 240
            abort: true
        - fix-workspace-permissions

    parameters:
        - project-parameter:
            project: '{project}'
            branch: '{branch}'
        - compass-dovetail-parameter:
            installer: '{installer}'
            gs-pathname: '{gs-pathname}'
        - '{slave-label}-defaults'
        - '{installer}-defaults'

    scm:
        - git-scm

    builders:
        - description-setter:
            description: "POD: $NODE_NAME"
        - shell:
            !include-raw-escape: ./compass-download-artifact.sh
        - shell:
            !include-raw-escape: ./compass-deploy.sh

########################
# parameter macros
########################
- parameter:
    name: compass-dovetail-parameter
    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: GS_URL
            default: '$GS_BASE{gs-pathname}'
            description: "URL to Google Storage."
        - choice:
            name: COMPASS_OPENSTACK_VERSION
            choices:
                - 'newton'

########################
# trigger macros
########################
- trigger:
    name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-danube-trigger'
    triggers:
        - timed: 'H H * * 0'

- trigger:
    name: 'dovetail-weekly-trigger'
    triggers:
        - timed: 'H H * * 0'