Add hotrod in release and push all tags (#2812)

.github/workflows/ci-all-in-one-build.yml

@@ -33,7 +33,7 @@ jobs:
       run: make install-ci
 
     - name: Build, test, and publish all-in-one image
-      run: bash scripts/travis/build-all-in-one-image.sh
+      run: bash scripts/build-all-in-one-image.sh
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

.github/workflows/ci-cassandra.yml

@@ -17,4 +17,4 @@ jobs:
         go-version: ^1.15
 
     - name: Run cassandra integration tests
-      run: bash scripts/travis/cassandra-integration-test.sh
+      run: bash scripts/cassandra-integration-test.sh

.github/workflows/ci-crossdock.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         steps:
         - name: crossdock
-          cmd: bash scripts/travis/build-crossdock.sh
+          cmd: bash scripts/build-crossdock.sh
         - name: crossdock-otel
           cmd: make build-crossdock crossdock-otel
     name: ${{ matrix.steps.name }}

.github/workflows/ci-docker-build.yml

@@ -36,7 +36,7 @@ jobs:
       run: make docker
 
     - name: Upload docker images
-      run: bash scripts/travis/upload-all-docker-images.sh
+      run: bash scripts/upload-all-docker-images.sh
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

.github/workflows/ci-elasticsearch.yml

@@ -36,4 +36,4 @@ jobs:
       run: make install-ci
 
     - name: Run elasticsearch integration tests
-      run: bash scripts/travis/es-integration-test.sh ${{ matrix.version.image }}
+      run: bash scripts/es-integration-test.sh ${{ matrix.version.image }}

.github/workflows/ci-hotrod.yml

@@ -29,7 +29,7 @@ jobs:
       run: make install-ci
 
     - name: Build, test, and publish hotrod image
-      run: bash scripts/travis/hotrod-integration-test.sh
+      run: bash scripts/hotrod-integration-test.sh
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

.github/workflows/ci-kafka.yml

@@ -17,4 +17,4 @@ jobs:
         go-version: ^1.15
 
     - name: Run kafka integration tests
-      run: bash scripts/travis/kafka-integration-test.sh
+      run: bash scripts/kafka-integration-test.sh

.github/workflows/ci-release.yml

@@ -37,7 +37,7 @@ jobs:
 
     - name: Package binaries
       id: package-binaries
-      run: bash scripts/travis/package-deploy.sh
+      run: bash scripts/package-deploy.sh
       if: steps.build-binaries.outcome == 'success'
 
     - name: Upload binaries
@@ -54,14 +54,20 @@ jobs:
       run: make docker
 
     - name: Upload docker images
-      run: bash scripts/travis/upload-all-docker-images.sh
+      run: bash scripts/upload-all-docker-images.sh
       if: steps.build-images.outcome == 'success'
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
 
     - name: Build, test, and publish all-in-one image
-      run: bash scripts/travis/build-all-in-one-image.sh
+      run: bash scripts/build-all-in-one-image.sh
+      env:
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+        QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
+
+    - name: Build, test, and publish hotrod image
+      run: bash scripts/hotrod-integration-test.sh
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

CONTRIBUTING.md

@@ -87,8 +87,7 @@ github.com/jaegertracing/jaeger
         spanstore/          - SpanReader / SpanWriter implementations
         dependencystore/
       elasticsearch/        - ES implementations of storage APIs
-  scripts/                  - Miscellaneous project scripts, e.g. license update script
-    travis/                 - Travis scripts called in .travis.yml
+  scripts/                  - Miscellaneous project scripts, e.g. github action and license update script
   storage/
     spanstore/              - SpanReader / SpanWriter interfaces
     dependencystore/

plugin/storage/es/README.md

@@ -50,9 +50,9 @@ To locally test the ElasticSearch storage plugin,
 * have [ElasticSearch](https://www.elastic.co/guide/en/elasticsearch/reference/current/setup.html) running on port 9200
 * run `STORAGE=es make storage-integration-test` in the top folder.
 
-All integration tests also run on pull request via Travis. This integration test is against ElasticSearch v5.4.0.
+All integration tests also run on pull request via GitHub Actions. This integration test is against ElasticSearch v5.6.16, v6.8.2 and v7.3.0.
 
-* The script used in Travis can be found under `./travis/es-integration-test.sh`, 
+* The script used in GitHub Actions can be found under `scripts/es-integration-test.sh`,
 and that script be run from the top folder to integration test ElasticSearch as well.
 This script requires Docker to be running.
 

scripts/travis/build-all-in-one-image.sh → scripts/build-all-in-one-image.sh

@@ -5,7 +5,7 @@ set -exu
 BRANCH=${BRANCH:?'missing BRANCH env var'}
 # Set default GOARCH variable to the host GOARCH, the target architecture can
 # be overrided by passing architecture value to the script:
-# `GOARCH=<target arch> ./scripts/travis/build-all-in-one-image.sh`.
+# `GOARCH=<target arch> ./scripts/build-all-in-one-image.sh`.
 GOARCH=${GOARCH:-$(go env GOARCH)}
 
 expected_version="v10"
@@ -39,7 +39,7 @@ upload_to_docker() {
   if [[ "$BRANCH" == "master" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
     echo "upload $1 to dockerhub/quay.io"
     REPO=$1
-    bash scripts/travis/upload-to-registry.sh $REPO
+    bash scripts/upload-to-registry.sh $REPO
   else
     echo 'skip docker images upload for PR'
   fi

scripts/travis/build-crossdock.sh → scripts/build-crossdock.sh

@@ -18,4 +18,4 @@ fi
 # docker image has been build when running the crossdock
 REPO=jaegertracing/test-driver
 docker tag $REPO:latest $REPO:$COMMIT
-bash scripts/travis/upload-to-registry.sh $REPO
+bash scripts/upload-to-registry.sh $REPO

scripts/travis/hotrod-integration-test.sh → scripts/hotrod-integration-test.sh

@@ -27,4 +27,4 @@ else
   exit 0
 fi
 
-bash scripts/travis/upload-to-registry.sh $REPO
+bash scripts/upload-to-registry.sh $REPO

scripts/travis/upload-all-docker-images.sh → scripts/upload-all-docker-images.sh

@@ -38,5 +38,5 @@ jaeger_components=(
 for component in "${jaeger_components[@]}"
 do
   REPO="jaegertracing/jaeger-${component}"
-  bash scripts/travis/upload-to-registry.sh $REPO
+  bash scripts/upload-to-registry.sh $REPO
 done

scripts/travis/upload-to-registry.sh → scripts/upload-to-registry.sh

@@ -85,7 +85,7 @@ upload_images() {
         docker push ${registry}/${image}:latest
         ;;
       *)
-        docker push ${registry}/${image}
+        docker push --all-tags ${registry}/${image}
         ;;
     esac