github actions: download from S3

scylladb · Jan 4, 2021 · 1d78d98 · 1d78d98
1 parent f2f6d54
commit 1d78d98
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -4,17 +4,16 @@ on:
   push:
     branches:
      - master
-     - next
+     - next*
      - docker-ccm
 
   pull_request:
     branches:
      - docker-ccm
-     - next
+     - next*
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -24,14 +23,25 @@ jobs:
       with:
         python-version: 3.8
 
+    - name: Cache pip
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-test.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
     - name: Install dependencies
       run: |
+        sudo apt-get update
         sudo apt-get install -y openjdk-8-jdk rpm2cpio
-        pip install -U pip setuptools pytest
+        pip install -U pip setuptools
+
         python setup.py install
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
-    - name: Cache versions
+        if [ -f requirements-test.txt ]; then pip install -r requirements-test.txt; fi
+
+    - name: Cache binary versions
       uses: actions/cache@v2
       with:
         path: |
@@ -43,7 +53,17 @@ jobs:
 
     - name: Download versions
       run: |
-        ./ccm create temp -n 1 --scylla --version unstable/master:2020-10-25T21%3A55%3A10Z > /dev/null
+        RELOC_VERSION="2020-10-25T21:55:10Z"
+        AWS_BASE=s3://downloads.scylladb.com/relocatable/unstable/master/${RELOC_VERSION}
+
+        aws s3 --only-show-errors --no-sign-request cp ${AWS_BASE}/scylla-package.tar.gz .
+        aws s3 --only-show-errors --no-sign-request cp ${AWS_BASE}/scylla-tools-package.tar.gz .
+        aws s3 --only-show-errors --no-sign-request cp ${AWS_BASE}/scylla-jmx-package.tar.gz .
+
+        ./ccm create temp -n 1 --scylla --version unstable/master:${RELOC_VERSION} \
+          --scylla-core-package-uri=./scylla-package.tar.gz \
+          --scylla-tools-java-package-uri=./scylla-tools-package.tar.gz \
+          --scylla-jmx-package-uri=./scylla-jmx-package.tar.gz
         ./ccm remove
         ./ccm create temp-cas -n 1 --version 3.11.4 > /dev/null
         ./ccm remove

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -0,0 +1,2 @@
+pytest
+awscli
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -7,4 +7,4 @@
 SCYLLA_DOCKER_IMAGE = os.environ.get(
     "SCYLLA_DOCKER_IMAGE", "scylladb/scylla-nightly:666.development-0.20201015.8068272b466")
 SCYLLA_RELOCATABLE_VERSION = os.environ.get(
-    "SCYLLA_VERSION", "unstable/master:2020-10-25T21%3A55%3A10Z")
+    "SCYLLA_VERSION", "unstable/master:2020-10-25T21:55:10Z")