Skip to content

Commit

Permalink
Build environment refactoring #13
Browse files Browse the repository at this point in the history
  • Loading branch information
rafie committed Jul 2, 2019
1 parent e6e9853 commit 3c6f5c1
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
name: Package
command: >-
mkdir -p /workspace/packages &&
make pack BRANCH="$(CIRCLE_BRANCH)" INTO=/workspace/packages
make pack BRANCH="$(CIRCLE_BRANCH)" INTO=/workspace/packages SHOW=1
- persist_to_workspace:
root: /workspace/packages
paths:
Expand Down
5 changes: 3 additions & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,14 @@ docker:

define ramp_pack # (1=tag, 2=subdir)
$(SHOW)ramp pack -m "$(ROOT)/ramp.yml" -v -o "$(BINROOT)/redistimeseries.{os}-{architecture}.$1.zip" $(TARGET) 2> /dev/null | grep '.zip' > /tmp/ramp_output
$(SHOW)tail -1 /tmp/ramp_output > $(BINROOT)/../PACKAGE.$(1)
$(SHOW)realpath `tail -1 /tmp/ramp_output` > $(BINROOT)/../PACKAGE.$(1)
$(SHOW)$(ROOT)/src/clean_ramp.py `cat $(BINROOT)/../PACKAGE.$(1)`
$(SHOW)if [ ! -z "$(INTO)" ]; then { mkdir -p $(INTO)/$(2); cp `cat $(BINROOT)/../PACKAGE.$(1)` $(INTO)/$(2); }; fi
endef

package: $(TARGET)
@if ! command -v redis-server > /dev/null; then \
@echo Creating packages...
$(SHOW)if ! command -v redis-server > /dev/null; then \
echo Cannot find redis-server. Aborting. ;\
exit 1 ;\
fi
Expand Down
2 changes: 1 addition & 1 deletion system-setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def common_first(self):
self.pip_install("setuptools --upgrade")
self.pip_install("-r tests/requirements.txt")

self.install("git jq")
self.install("git jq curl")

def debian_compat(self):
self.install("build-essential")
Expand Down
27 changes: 27 additions & 0 deletions tests/qa/automation-testing.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"service_id": "single_module_test_cycle_sanity_and_extended",
"name": "redistimeseries automation-testing",
"properties": {
"sut_version": "master",
"email_recipients": "t9b6i7v6e2q3d0s4@redislabs.slack.com",
"sut_environments": [
],
"tools_environment": {
},
"module_name": "redistimeseries",
"module_version": "master",
"cycle_environments_setup": [
{
"teardown": true,
"name": "xenial-amd64-aws",
"concurrency": 1
},
{
"teardown": true,
"name": "bionic-amd64-aws",
"concurrency": 1
}
]
}
}

7 changes: 7 additions & 0 deletions tests/qa/run
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

curl -f -k -u $QA_AUTOMATION_USERNAME:$QA_AUTOMATION_PASS \
-X POST -H "Content-Type: application/json" \
-d '@automation-testing.json' \
https://qa-automation-center.redislabs.com/processes

0 comments on commit 3c6f5c1

Please sign in to comment.