Skip to content

Commit

Permalink
Merge branch 'master' into dev-addTLS-rjs211
Browse files Browse the repository at this point in the history
  • Loading branch information
rjs211 authored Jan 7, 2021
2 parents d3edb98 + e788e55 commit 1bee20f
Show file tree
Hide file tree
Showing 143 changed files with 2,956 additions and 864 deletions.
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Jaeger Community Support
- name: Question via Jaeger Community Support (online chat)
url: https://gitter.im/jaegertracing/Lobby
about: Please ask and answer questions here.
- name: Report Security Issues
url: https://www.jaegertracing.io/report-security-issue/
about: Please report security vulnerabilities here.
about: Please ask and answer questions here for faster response.
- name: Question via GitHub Discussions (similar to Stack Overflow)
url: https://github.com/jaegertracing/jaeger/discussions
about: Please ask and answer questions here for async response.
10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/question.md

This file was deleted.

18 changes: 18 additions & 0 deletions .github/actions/setup-branch/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 'Setup BRANCH'
description: 'Make BRANCH var accessible to job'
runs:
using: "composite"
steps:
- name: Setup BRANCH
shell: bash
run: |
case ${GITHUB_EVENT_NAME} in
pull_request)
BRANCH=${GITHUB_HEAD_REF}
;;
push)
BRANCH=${GITHUB_REF##*/}
;;
esac
echo "we are on branch=${BRANCH}"
echo "BRANCH=${BRANCH}" >> ${GITHUB_ENV}
50 changes: 50 additions & 0 deletions .github/workflows/ci-all-in-one-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Build all-in-one

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
all-in-one:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: Fetch git tags
run: |
git fetch --prune --unshallow --tags
- uses: actions/setup-go@v2
with:
go-version: ^1.15

- uses: actions/setup-node@v2-beta
with:
node-version: '10'

- uses: docker/login-action@v1
id: dockerhub-login
with:
username: jaegertracingbot
password: ${{ secrets.DOCKERHUB_TOKEN }}
env:
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
if: env.DOCKERHUB_TOKEN != null

- name: Export DOCKERHUB_LOGIN variable
run: |
echo "DOCKERHUB_LOGIN=true" >> $GITHUB_ENV
if: steps.dockerhub-login.outcome == 'success'

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch

- name: Install tools
run: make install-ci

- name: Build, test, and publish all-in-one image
run: bash scripts/travis/build-all-in-one-image.sh
20 changes: 20 additions & 0 deletions .github/workflows/ci-cassandra.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: CIT Cassandra

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
cassandra:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-go@v2
with:
go-version: ^1.15

- name: Run cassandra integration tests
run: bash scripts/travis/cassandra-integration-test.sh
58 changes: 58 additions & 0 deletions .github/workflows/ci-crossdock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: CIT Crossdock

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
crossdock:
runs-on: ubuntu-latest
strategy:
matrix:
steps:
- name: crossdock
cmd: bash scripts/travis/build-crossdock.sh
- name: crossdock-otel
cmd: make build-crossdock crossdock-otel
name: ${{ matrix.steps.name }}
steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: Fetch git tags
run: |
git fetch --prune --unshallow --tags
- uses: actions/setup-go@v2
with:
go-version: ^1.15

- uses: docker/login-action@v1
id: dockerhub-login
with:
username: jaegertracingbot
password: ${{ secrets.DOCKERHUB_TOKEN }}
env:
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
if: env.DOCKERHUB_TOKEN != null

- name: Export DOCKERHUB_LOGIN variable
run: |
echo "DOCKERHUB_LOGIN=true" >> $GITHUB_ENV
if: steps.dockerhub-login.outcome == 'success'

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch

- name: Install tools
run: make install-ci

- name: Build, test, and publish ${{ matrix.steps.name }} image
run: ${{ matrix.steps.cmd }}

- name: Output crossdock logs
run: make crossdock-logs
if: ${{ failure() }}
39 changes: 39 additions & 0 deletions .github/workflows/ci-elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: CIT Elasticsearch

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
elasticsearch:
runs-on: ubuntu-latest
strategy:
matrix:
version:
- major: 5.x
image: 5.6.16
- major: 6.x
image: 6.8.2
- major: 7.x
image: 7.3.0
name: elasticsearch ${{ matrix.version.major }}
steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: Fetch git tags
run: |
git fetch --prune --unshallow --tags
- uses: actions/setup-go@v2
with:
go-version: ^1.15

- name: Install tools
run: make install-ci

- name: Run elasticsearch integration tests
run: bash scripts/travis/es-integration-test.sh ${{ matrix.version.image }}
46 changes: 46 additions & 0 deletions .github/workflows/ci-hotrod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: CIT Hotrod

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
hotrod:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: Fetch git tags
run: |
git fetch --prune --unshallow --tags
- uses: actions/setup-go@v2
with:
go-version: ^1.15

- uses: docker/login-action@v1
id: dockerhub-login
with:
username: jaegertracingbot
password: ${{ secrets.DOCKERHUB_TOKEN }}
env:
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
if: env.DOCKERHUB_TOKEN != null

- name: Export DOCKERHUB_LOGIN variable
run: |
echo "DOCKERHUB_LOGIN=true" >> $GITHUB_ENV
if: steps.dockerhub-login.outcome == 'success'

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch

- name: Install tools
run: make install-ci

- name: Build, test, and publish hotrod image
run: bash scripts/travis/hotrod-integration-test.sh
20 changes: 20 additions & 0 deletions .github/workflows/ci-kafka.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: CIT Kafka

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
kafka:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-go@v2
with:
go-version: ^1.15

- name: Run kafka integration tests
run: bash scripts/travis/kafka-integration-test.sh
20 changes: 20 additions & 0 deletions .github/workflows/ci-memory-badger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: CIT Memory And Badger

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
memory-badger:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-go@v2
with:
go-version: ^1.15

- name: Run in-memory and badger integration tests
run: make mem-and-badger-storage-integration-test
22 changes: 22 additions & 0 deletions .github/workflows/ci-protogen-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Protogen Validation

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
protogen:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true

- uses: actions/setup-go@v2
with:
go-version: ^1.15

- name: Run protogen validation
run: make proto && git diff --name-status --exit-code
30 changes: 30 additions & 0 deletions .github/workflows/ci-unit-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Unit Tests

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
unit-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-go@v2
with:
go-version: ^1.15

- name: Install tools
run: make install-ci

- name: Run unit tests
run: make test-ci

- name: Upload coverage to codecov
uses: codecov/codecov-action@v1
with:
file: cover.out
fail_ci_if_error: true
verbose: true
Loading

0 comments on commit 1bee20f

Please sign in to comment.