MOD-5869: Support mariner2 via github actions (RedisJSON#1102)

nafraf · web-flow · commit e2326238051a · 2023-10-10T13:57:22.000-05:00
* Support mariner2 via github actions
diff --git a/.github/workflows/mariner2.yml b/.github/workflows/mariner2.yml
@@ -0,0 +1,58 @@
+name: Build for mariner2
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l -eo pipefail {0}
+    container:
+      image: mcr.microsoft.com/cbl-mariner/base/core:2.0
+    steps:
+      - name: Install prereqs
+        run: |
+          tdnf install --noplugins --skipsignature -y ca-certificates git
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - name: Install dependencies
+        run: |
+          bash .install/mariner2.sh
+      - name: Get Redis
+        uses: actions/checkout@v4
+        with:
+          repository: redis/redis
+          ref: '7.2.1'
+          path: redis
+      - name: Build Redis
+        working-directory: redis
+        run: make install
+      - name: Build module
+        run: |
+          make build
+      - name: Test
+        run: |
+          make test
+      - name: Pack module
+        run: |
+          make pack BRANCH=${{ github.ref_name }}
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: "us-east-1"
+      - name: Upload artifacts to S3 - staging
+        run: |
+          make upload-artifacts SHOW=1 STAGING=1 VERBOSE=1
+      - name: Upload artifacts to S3 - release  # todo: trigger this manually instead
+        if: ${{ github.ref != 'refs/heads/master' }}
+        run: make upload-artifacts SHOW=1 VERBOSE=1
diff --git a/.install/mariner2.sh b/.install/mariner2.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+tdnf install -q -y build-essential git wget ca-certificates tar openssl-devel \
+    cmake python3 python3-pip rust clang which unzip
+
+pip install -q --upgrade setuptools
+pip install -q --upgrade pip
+pip install -q -r tests/pytest/requirements.txt
+
+# These packages are needed to build the package
+pip install -q addict toml jinja2 ramp-packer
+
+# Install aws-cli for uploading artifacts to s3
+curdir="$PWD"
+cd /tmp/
+curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+unzip awscliv2.zip
+./aws/install
+cd $curdir
diff --git a/sbin/upload-artifacts b/sbin/upload-artifacts
@@ -66,16 +66,9 @@ else
 	S3_URL=s3://redismodules
 fi
 
-if [[ $FORCE != 1 ]]; then
-	if [[ -z $CIRCLECI ]]; then
-		eprint "Cannot upload outside of CircleCI. Override with FORCE=1."
-		exit 1
-	fi
-
-	if [[ -z $AWS_ACCESS_KEY_ID || -z $AWS_SECRET_ACCESS_KEY ]]; then
-		eprint "No credentials for S3 upload."
-		exit 1
-	fi
+if [[ -z $AWS_ACCESS_KEY_ID || -z $AWS_SECRET_ACCESS_KEY ]]; then
+	eprint "No credentials for S3 upload."
+	exit 1
 fi
 
 cd $ROOT/bin
@@ -96,7 +89,7 @@ s3_upload_file() {
 	local s3_dir="$2"
 	[[ $s3_dir != */ ]] && s3_dir="${s3_dir}/"
 	
-	$OP aws s3 cp $file $s3_dir --acl public-read --no-progress
+	$OP aws --debug s3 cp $file $s3_dir --acl public-read --no-progress
 }
 
 s3_ls() {
diff --git a/tests/pytest/requirements.txt b/tests/pytest/requirements.txt
@@ -1,7 +1,3 @@
-# redis ~= 5.0.0b3
-# RLTest ~= 0.7.0
-# ramp-packer ~= 2.5.4
-# psutil >= 5.8.0
-
+RLTest ~= 0.7.2
 six >= 1.10.0
-gevent ~= 22.10.1
+gevent >= 23.9.1
diff --git a/tests/pytest/tests.sh b/tests/pytest/tests.sh
@@ -156,6 +156,7 @@ setup_rltest() {
 	if [[ $RLTEST_CONSOLE == 1 ]]; then
 		RLTEST_ARGS+=" -i"
 	fi
+	RLTEST_ARGS+=" --enable-debug-command --enable-protected-configs"
 }
 
 #----------------------------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ setup_rltest() {`
`156`	`156`	`if [[ $RLTEST_CONSOLE == 1 ]]; then`
`157`	`157`	`RLTEST_ARGS+=" -i"`
`158`	`158`	`fi`
	`159`	`+ RLTEST_ARGS+=" --enable-debug-command --enable-protected-configs"`
`159`	`160`	`}`
`160`	`161`
`161`	`162`	`#----------------------------------------------------------------------------------------------`