Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ubuntu20 #2949

Merged
merged 3 commits into from
Nov 24, 2020
Merged

Ubuntu20 #2949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4266ec4
Update CircleCI machine to ubuntu-20.04
chrzaszcz Oct 30, 2020
12c313b
Fix python issues
NelsonVides Oct 30, 2020
2bd8c36
Build docker container with phusion/focal-alpha
NelsonVides Nov 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ orbs:
sudo apt-get update && \
sudo apt-get install unixodbc-dev -y && \
sudo apt-get install unixodbc -y && \
sudo apt-get install tdsodbc -y && \
sudo apt-get install python-pip -y && \
sudo pip install --upgrade pip
sudo apt-get install tdsodbc -y
jobs:
build:
parallelism: 1
machine:
image: ubuntu-1604:201903-01
image: ubuntu-2004:202010-01
parameters:
otp_package:
type: string
Expand Down Expand Up @@ -96,7 +94,7 @@ orbs:
dialyzer:
parallelism: 1
machine:
image: ubuntu-1604:201903-01
image: ubuntu-2004:202010-01
working_directory: ~/app
parameters:
otp_package:
Expand All @@ -115,7 +113,7 @@ orbs:
small_tests:
parallelism: 1
machine:
image: ubuntu-1604:201903-01
image: ubuntu-2004:202010-01
working_directory: ~/app
parameters:
otp_package:
Expand Down Expand Up @@ -147,7 +145,7 @@ orbs:
when: on_success
command: |
echo "Success!"
sudo pip install codecov && codecov
pip3 install codecov && codecov
./rebar3 codecov analyze
codecov --disable=gcov --env PRESET
- run:
Expand All @@ -161,7 +159,7 @@ orbs:
package:
parallelism: 1
machine:
image: ubuntu-1604:201903-01
image: ubuntu-2004:202010-01
working_directory: ~/app
parameters:
platform:
Expand All @@ -184,7 +182,7 @@ orbs:
big_tests:
parallelism: 1
machine:
image: ubuntu-1604:201903-01
image: ubuntu-2004:202010-01
working_directory: ~/app
parameters:
otp_package:
Expand Down Expand Up @@ -245,7 +243,7 @@ orbs:
when: on_success
command: |
echo "Success!"
sudo pip install codecov && codecov
pip3 install codecov && codecov
./rebar3 codecov analyze
codecov --disable=gcov --env PRESET
- run:
Expand All @@ -266,7 +264,7 @@ orbs:
docker_image:
parallelism: 1
machine:
image: ubuntu-1604:201903-01
image: ubuntu-2004:202010-01
working_directory: ~/app
parameters:
otp_package:
Expand Down Expand Up @@ -301,24 +299,24 @@ workflows:
- mim/package:
name: centos_7
platform: centos_7
otp_package: 22.1.8-2
otp_package: 22.3.4.9-1
context: mongooseim-org
filters: *all_tags
- mim/package:
name: debian_stretch
platform: debian_stretch
otp_package: 22.1.8-1
otp_package: 22.3.4.9-1
context: mongooseim-org
filters: *all_tags
# ============= BASE BUILDS =============
- mim/build:
name: otp_21_3
otp_package: 21.3.8.6-1
otp_package: 21.3.8.17-1
context: mongooseim-org
filters: *all_tags
- mim/build:
name: otp_22
otp_package: 22.1.8-1
otp_package: 22.3.4.9-1
build_prod: true
context: mongooseim-org
filters: *all_tags
Expand All @@ -331,14 +329,14 @@ workflows:
# ============= SMALL TESTS =============
- mim/small_tests:
name: small_tests_21_3
otp_package: 21.3.8.6-1
otp_package: 21.3.8.17-1
context: mongooseim-org
requires:
- otp_21_3
filters: *all_tags
- mim/small_tests:
name: small_tests_22
otp_package: 22.1.8-1
otp_package: 22.3.4.9-1
context: mongooseim-org
requires:
- otp_22
Expand Down Expand Up @@ -424,7 +422,7 @@ workflows:
# ============= 1 VERSION OLDER TESTS =============
- mim/big_tests:
name: ldap_mnesia_22
otp_package: 22.1.8-1
otp_package: 22.3.4.9-1
preset: ldap_mnesia
db: mnesia
context: mongooseim-org
Expand All @@ -434,7 +432,7 @@ workflows:
# ============= 2 VERSIONS OLDER TESTS =============
- mim/big_tests:
name: ldap_mnesia_21
otp_package: 21.3.8.6-1
otp_package: 21.3.8.17-1
preset: ldap_mnesia
db: mnesia
context: mongooseim-org
Expand Down
2 changes: 1 addition & 1 deletion tools/circle-build-and-push-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ IMAGE_TAG=${DOCKERHUB_REPO}/mongooseim:${DOCKERHUB_TAG}

git clone https://github.com/esl/mongooseim-docker.git
cd mongooseim-docker
git checkout 318e1ee6582e7473303a2cd0b4baca0c9c09a1be
git checkout d4c0956b5038778d301d1de56cb2833c16c6f34a

cp ../${MONGOOSE_TGZ} member

Expand Down
13 changes: 2 additions & 11 deletions tools/circleci-upload-to-s3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,9 @@ FILE_COUNT=$(find "${CT_REPORTS}" -type f | wc -l)
echo "Uploading $FILE_COUNT files"
ls $CT_REPORTS

S3PP_COMMIT=6fd430a54e976d2d580042efdf82ac2fb66d5e57
wget -O tools/s3-parallel-put https://raw.githubusercontent.com/arcusfelis/s3-parallel-put/$S3PP_COMMIT/s3-parallel-put
chmod +x tools/s3-parallel-put

sudo pip install boto python-magic
sudo pip install awscli --upgrade --user
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
aws configure set default.region $AWS_DEFAULT_REGION
aws configure set default.s3.max_concurrent_requests 64

sudo tools/s3-parallel-put --quiet --processes=64 --put=stupid \
--host=s3.$AWS_DEFAULT_REGION.amazonaws.com --bucket_region=$AWS_DEFAULT_REGION \
--bucket=circleci-mim-results --prefix=${CT_REPORTS} ${CT_REPORTS} --grant=public-read


time aws s3 cp ${CT_REPORTS} s3://circleci-mim-results/${CT_REPORTS} --acl public-read --recursive --quiet