Skip to content

Commit b07bbec

Browse files
committed
Merge remote-tracking branch 'upstream/master' into origo_argus_colossus_operational_status_feat
2 parents 33997c4 + dac64ea commit b07bbec

85 files changed

Lines changed: 1236 additions & 16120 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@ APP_PRIVATE_KEY=this-is-not-so-secret-change-it
123123
TRUSTED_REVERSE_PROXIES=1
124124
# =====================================================================================
125125

126+
## Telemetry
127+
# yes/no
128+
TELEMETRY_ENABLED=no
129+
# TELEMETRY_ENDPOINT=http://apm-server:8200
130+
TELEMETRY_ENDPOINT=http://collector:4318
131+
126132
# joystream/node docker image tag
127133
# We do not provide a default value - scripts that startup a joystream-node service
128134
# Should be explicit about what version to use.

.github/workflows/deploy-node-network.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ jobs:
8686
EC2InstanceType=${{ steps.network_config.outputs.instanceType }},
8787
VolumeSize=${{ steps.network_config.outputs.volumeSize }}
8888
89+
- name: Wait for docker build server to be ready
90+
run: |
91+
sleep 30
92+
8993
- name: Prepare inventory for Ansible
9094
run: |
9195
VAL1="${{ steps.deploy_stack.outputs.Val1PublicIp }}"

.github/workflows/deploy-playground.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ jobs:
8686
# Make sure ami image is available in the region specified in configure aws creds step
8787
parameter-overrides: 'KeyName=joystream-github-action-key-new,EC2InstanceType=t2.xlarge,EC2AMI=ami-06b4d9ba1f23a8da4'
8888

89+
- name: Wait for docker build server to be ready
90+
run: |
91+
sleep 30
92+
8993
- name: Run playbook
9094
uses: dawidd6/action-ansible-playbook@v2
9195
with:

.github/workflows/joystream-apps-docker.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ jobs:
2424
echo "argus_version=$(cat distributor-node/package.json | jq -r '.version')" >> $GITHUB_OUTPUT
2525
echo "qn_version=$(cat query-node/package.json | jq -r '.version')" >> $GITHUB_OUTPUT
2626
27+
- name: Make some space
28+
shell: bash
29+
run: |
30+
sudo rm -rf /usr/share/dotnet
31+
sudo rm -rf /opt/ghc
32+
sudo rm -rf "/usr/local/share/boost"
33+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
34+
2735
- name: Set up Docker Buildx
2836
uses: docker/setup-buildx-action@v2
2937
- name: Login to DockerHub
@@ -74,14 +82,7 @@ jobs:
7482
run: |
7583
yarn build:packages
7684
cp docker-compose-no-bind-volumes.yml docker-compose.yml
77-
./tests/network-tests/run-test-node-docker.sh
78-
sleep 15
79-
docker compose up -d db indexer hydra-indexer-gateway processor graphql-server
80-
sleep 30
81-
./tests/network-tests/start-storage.sh
82-
export REUSE_KEYS=true
83-
export SKIP_STORAGE_AND_DISTRIBUTION=true
84-
IGNORE_HIRED_LEADS=true ./tests/network-tests/run-test-scenario.sh content-directory
85+
./tests/network-tests/run-tests.sh content-directory
8586
8687
- name: Push new versions
8788
if: github.event_name == 'workflow_dispatch'
@@ -97,6 +98,6 @@ jobs:
9798
if: github.ref == 'refs/heads/master' && github.event_name == 'workflow_dispatch'
9899
run: |
99100
docker push joystream/storage-node:latest
100-
docker push joystream/distributor:latest
101+
docker push joystream/distributor-node:latest
101102
docker push joystream/query-node:latest
102103

.github/workflows/joystream-cli.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
node-version: [14.x]
10+
node-version: [18.x]
1111
steps:
1212
- uses: actions/checkout@v3
1313
- name: Use Node.js ${{ matrix.node-version }}
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: macos-latest
3333
strategy:
3434
matrix:
35-
node-version: [14.x]
35+
node-version: [18.x]
3636
steps:
3737
- uses: actions/checkout@v3
3838
- name: Use Node.js ${{ matrix.node-version }}

.github/workflows/joystream-node-docker-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- uses: actions/setup-node@v3
2020
with:
21-
node-version: '14.x'
21+
node-version: '18.x'
2222

2323
- id: compute_shasum
2424
name: Compute runtime code shasum

.github/workflows/joystream-node-docker.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- uses: actions/setup-node@v3
3030
with:
31-
node-version: '14.x'
31+
node-version: '18.x'
3232

3333
- id: compute_shasum
3434
name: Compute runtime code shasum
@@ -78,7 +78,7 @@ jobs:
7878

7979
- uses: actions/setup-node@v3
8080
with:
81-
node-version: '14.x'
81+
node-version: '18.x'
8282

8383
# docker manifest inspect requires authentication
8484
- name: Login to DockerHub
@@ -118,6 +118,10 @@ jobs:
118118
parameter-overrides: 'KeyName=${{ env.KEY_NAME }},EC2AMI=${{ matrix.ec2ami }},EC2InstanceType=${{ matrix.ec2type }}'
119119
if: ${{ steps.compute_image_exists.outputs.image_exists == 1 }}
120120

121+
- name: Wait for docker build server to be ready
122+
run: |
123+
sleep 30
124+
121125
- name: Run playbook
122126
uses: dawidd6/action-ansible-playbook@v2
123127
with:

.github/workflows/joystream-node.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v3
1313
- uses: actions/setup-node@v3
1414
with:
15-
node-version: '14.x'
15+
node-version: '18.x'
1616
- uses: technote-space/get-diff-action@v3
1717
with:
1818
PREFIX_FILTER: |
@@ -56,7 +56,7 @@ jobs:
5656
- uses: actions/checkout@v3
5757
- uses: actions/setup-node@v3
5858
with:
59-
node-version: '14.x'
59+
node-version: '18.x'
6060
- uses: technote-space/get-diff-action@v3
6161
with:
6262
PREFIX_FILTER: |

.github/workflows/joystream-types.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
node-version: [14.x]
10+
node-version: [18.x]
1111
steps:
1212
- uses: actions/checkout@v3
1313
- name: Use Node.js ${{ matrix.node-version }}
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: macos-latest
3131
strategy:
3232
matrix:
33-
node-version: [14.x]
33+
node-version: [18.x]
3434
steps:
3535
- uses: actions/checkout@v3
3636
- name: Use Node.js ${{ matrix.node-version }}

.github/workflows/lint-typescript.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
node-version: [14.x]
10+
node-version: [18.x]
1111
steps:
1212
- uses: actions/checkout@v3
1313
- name: Use Node.js ${{ matrix.node-version }}
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: macos-latest
2525
strategy:
2626
matrix:
27-
node-version: [14.x]
27+
node-version: [18.x]
2828
steps:
2929
- uses: actions/checkout@v3
3030
- name: Use Node.js ${{ matrix.node-version }}

0 commit comments

Comments
 (0)