Skip to content

Instantly share code, notes, and snippets.

@delevaa

delevaa/merge_conflists_2_19_3.patch

Last active June 20, 2018 15:23
Show Gist options
  • Save delevaa/8712c8642cfb9cfd1e2b2d611e9cebcc to your computer and use it in GitHub Desktop.
Save delevaa/8712c8642cfb9cfd1e2b2d611e9cebcc to your computer and use it in GitHub Desktop.
Download ZIP
Raw
merge_conflists_2_19_3.patch
diff --cc .circleci/ci.sh
index fd909aa,d93f635..0000000
--- a/.circleci/ci.sh
+++ b/.circleci/ci.sh
@@@ -190,24 -190,12 +190,30 @@@ checkDeployStatus()
[[ $retries -eq i ]] && { echo "Deployment failed."; exit 1; }
}
++<<<<<<< HEAD
+slackNotification() {
+ workflowName=$(getBuildDetails "$CIRCLE_BUILD_NUM" | jq -r '.workflows.workflow_name')
+ message="Manual approval required to deploy $workflowName https://circleci.com/workflow-run/$CIRCLE_WORKFLOW_ID"
+ payload='payload={"username":"CircleCi","text":"'"$message"'"}'
+ curl -X POST -d "$payload" $SLACK_WEBHOOK_URL
+}
+
++=======
++>>>>>>> upstream/release/v2.19.3
case "$1" in
'wait')
echo "Waiting for running jobs"
waitForRunningJobs
;;
++<<<<<<< HEAD
+ 'slack-notification')
+ echo "Sending message to slack channel"
+ slackNotification
+ ;;
+
++=======
++>>>>>>> upstream/release/v2.19.3
'cancel')
echo "Canceling running jobs"
cancelRunningJobs
diff --cc .circleci/config.yml
index e11dd2f,0151077..0000000
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@@ -442,23 -442,6 +442,26 @@@ jobs
command: |
source $BASH_ENV
./.circleci/ci.sh check-deploy
++<<<<<<< HEAD
+
+ slack-notification:
+ docker:
+ - image: quay.io/reciprocity/jq
+ auth:
+ username: $QUAY_USERNAME
+ password: $QUAY_PASSWORD
+ steps:
+ - checkout
+ - run:
+ name: Send slack message
+ command: |
+ set -x
+ echo SLACK_WEBHOOK_URL=${SLACK_WEBHOOK_URL} >> $BASH_ENV
+ source $BASH_ENV
+ ./.circleci/ci.sh slack-notification
+
++=======
++>>>>>>> upstream/release/v2.19.3
workflows:
version: 2
test:
@@@ -555,20 -538,10 +558,26 @@@
ignore: /.*/
tags:
only: /^v.*/
++<<<<<<< HEAD
+ - slack-notification:
+ context: k8s-working-1-test
+ requires:
+ - build-and-push-image
+ filters:
+ branches:
+ ignore: /.*/
+ tags:
+ only: /^v.*/
++=======
++>>>>>>> upstream/release/v2.19.3
- hold:
type: approval
requires:
- build-and-push-image
++<<<<<<< HEAD
+ - slack-notification
++=======
++>>>>>>> upstream/release/v2.19.3
filters:
tags:
only: /^v.*/
diff --cc Dockerfile
index 8969887,2819141..0000000
--- a/Dockerfile
+++ b/Dockerfile
@@@ -136,8 -118,24 +136,29 @@@ RUN apk --no-cache add --virtual build-
RUN apk -q --no-cache add git libpq mariadb-client-libs libmemcached-dev memcached curl xmlsec
++<<<<<<< HEAD
+# Confd configuration management tool
+COPY --from=confd /go/bin/confd /usr/local/bin/confd
++=======
+ # Confd configuration management tool (used for fetching zengrc setting from aws
+ # parameter store and creating configuration file)
+ # We are fetching binary from github, checking hash of the binary and installing
+ # it to /usr/local/bin
+ ENV CONFD_VERSION=0.16.0
+ ENV CONFD_BIN=confd-${CONFD_VERSION}-linux-amd64 \
+ CONFD_URL=https://github.com/kelseyhightower/confd/releases/download/v${CONFD_VERSION}/confd-${CONFD_VERSION}-linux-amd64 \
+ CONFD_SHA1SUM=3d0a3ca940e5305af1a8294fdf5e370ebc0ac87c
+
+ RUN curl -fsSLO ${CONFD_URL} \
+ && echo "${CONFD_SHA1SUM} ${CONFD_BIN}" | sha1sum -c - \
+ && chmod +x ${CONFD_BIN} \
+ && mv ${CONFD_BIN} "/usr/local/bin/${CONFD_BIN}" \
+ && ln -s "/usr/local/bin/${CONFD_BIN}" /usr/local/bin/confd
+
+ # Copying confd configuration file with template to generate customer.yaml file
+ COPY ./settings/confd/zengrc.toml /etc/confd/conf.d/zengrc.toml
+ COPY ./settings/confd/customer.yaml.tmpl /etc/confd/templates/customer.yaml.tmpl
++>>>>>>> upstream/release/v2.19.3
# CRON replacement
ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.1.4/supercronic-linux-amd64 \
diff --cc src/zen_configurator/loaders/yaml/default.yaml
index 4cbf93f,7b504af..0000000
--- a/src/zen_configurator/loaders/yaml/default.yaml
+++ b/src/zen_configurator/loaders/yaml/default.yaml
@@@ -124,9 -128,8 +128,14 @@@ settings
ENABLE_V3_EXPERIENCE: false
ENABLE_COMPOSITE_LIKELIHOOD: false
ENABLE_LEGACY_EVENTS_LOG: true
++<<<<<<< HEAD
+ ENABLE_LISTING_MODALS: false # new cards/modals for SORv2 listings
+ ENABLE_CREATE_MODALS: false # new cards/modals for SORv2 object creation
+ ENABLE_NEW_TODO_LIST: false # new todo list view
++=======
+ ENABLE_LISTING_CSV_EXPORT: true # only on the action button in the listings
+ ENABLE_SURVEYS: true
++>>>>>>> upstream/release/v2.19.3
## Totango Integration ##
TOTANGO_SERVICE_ID: ''
@@@ -151,7 -154,7 +160,11 @@@
DO_LOGGING: true
HOST: 0.0.0.0
MAX_INSTANCES: '3' # Front-end API request batching
++<<<<<<< HEAD
+ VERSION: v2.20-DEV
++=======
+ VERSION: v2.19.3
++>>>>>>> upstream/release/v2.19.3
FULLTEXT_INDEXER: ggrc.fulltext.mysql.MysqlIndexer
## DataDog APM Settings ##
diff --cc test/unit/ggrc/models/all_models/test_attributes.py
index aaf828b,e567538..0000000
--- a/test/unit/ggrc/models/all_models/test_attributes.py
+++ b/test/unit/ggrc/models/all_models/test_attributes.py
@@@ -54,7 -100,7 +54,11 @@@ class TestAllModelsAttributes(TestCase)
'_filter_by_contact',
'_filter_by_modified_by',
'_filter_by_owners',
++<<<<<<< HEAD
+ '_filter_by_related_people',
++=======
+ '_filter_by_recur_frequency',
++>>>>>>> upstream/release/v2.19.3
'_filter_by_related_assessors',
'_filter_by_related_creators',
'_filter_by_related_verifiers',
@@@ -3721,7 -4008,7 +3778,11 @@@
'_display_name',
'_extra_table_args',
'_filter_by_modified_by',
++<<<<<<< HEAD
+ '_filter_by_related_people',
++=======
+ '_filter_by_recur_frequency',
++>>>>>>> upstream/release/v2.19.3
'_filter_by_related_assignees',
'_filter_by_related_requesters',
'_filter_by_related_verifiers',
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment