Migrate test docker images to GHCR. (#1790)
This commit is contained in:
parent
e92bdb46f8
commit
3475cbd77d
|
@ -24,7 +24,11 @@ jobs:
|
||||||
job-id: grpc-smoke
|
job-id: grpc-smoke
|
||||||
|
|
||||||
- name: Login to GitHub Package Registry
|
- name: Login to GitHub Package Registry
|
||||||
run: docker login -u ${{ secrets.BINTRAY_USER }} -p ${{ secrets.BINTRAY_API_KEY }} open-telemetry-docker-dev.bintray.io
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.repository_owner }}
|
||||||
|
password: ${{ secrets.GHCR_TOKEN }}
|
||||||
|
|
||||||
- name: Build Docker Image
|
- name: Build Docker Image
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -24,7 +24,11 @@ jobs:
|
||||||
job-id: play-smoke
|
job-id: play-smoke
|
||||||
|
|
||||||
- name: Login to GitHub Package Registry
|
- name: Login to GitHub Package Registry
|
||||||
run: docker login -u ${{ secrets.BINTRAY_USER }} -p ${{ secrets.BINTRAY_API_KEY }} open-telemetry-docker-dev.bintray.io
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.repository_owner }}
|
||||||
|
password: ${{ secrets.GHCR_TOKEN }}
|
||||||
|
|
||||||
- name: Build Docker Image
|
- name: Build Docker Image
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -24,7 +24,11 @@ jobs:
|
||||||
job-id: fakebackend-smoke
|
job-id: fakebackend-smoke
|
||||||
|
|
||||||
- name: Login to GitHub Package Registry
|
- name: Login to GitHub Package Registry
|
||||||
run: docker login -u ${{ secrets.BINTRAY_USER }} -p ${{ secrets.BINTRAY_API_KEY }} open-telemetry-docker-dev.bintray.io
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.repository_owner }}
|
||||||
|
password: ${{ secrets.GHCR_TOKEN }}
|
||||||
|
|
||||||
- name: Build Docker Image
|
- name: Build Docker Image
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -24,7 +24,11 @@ jobs:
|
||||||
job-id: springboot-smoke
|
job-id: springboot-smoke
|
||||||
|
|
||||||
- name: Login to GitHub Package Registry
|
- name: Login to GitHub Package Registry
|
||||||
run: docker login -u ${{ secrets.BINTRAY_USER }} -p ${{ secrets.BINTRAY_API_KEY }} open-telemetry-docker-dev.bintray.io
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.repository_owner }}
|
||||||
|
password: ${{ secrets.GHCR_TOKEN }}
|
||||||
|
|
||||||
- name: Build Docker Image
|
- name: Build Docker Image
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -31,6 +31,5 @@ dependencies {
|
||||||
|
|
||||||
jib {
|
jib {
|
||||||
from.image = "gcr.io/distroless/java-debian10:11"
|
from.image = "gcr.io/distroless/java-debian10:11"
|
||||||
to.image = "open-telemetry-docker-dev.bintray.io/java/smoke-fake-backend"
|
to.image = "ghcr.io/open-telemetry/java-test-containers:smoke-fake-backend-${new Date().format("yyyyMMdd.HHmmSS")}"
|
||||||
to.tags = [new Date().format("yyyyMMdd.HHmmSS")]
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,5 @@ def tag = findProperty("tag") ?: new Date().format("yyyyMMdd.HHmmSS")
|
||||||
|
|
||||||
jib {
|
jib {
|
||||||
from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
|
from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
|
||||||
to.image = "open-telemetry-docker-dev.bintray.io/java/smoke-grpc-jdk$targetJDK"
|
to.image = "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$targetJDK-$tag"
|
||||||
to.tags = [tag]
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,6 @@ def tag = findProperty("tag") ?: new Date().format("yyyyMMdd.HHmmSS")
|
||||||
|
|
||||||
jib {
|
jib {
|
||||||
from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
|
from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
|
||||||
to.image = "open-telemetry-docker-dev.bintray.io/java/smoke-play-jdk$targetJDK"
|
to.image = "ghcr.io/open-telemetry/java-test-containers:smoke-play-jdk$targetJDK-$tag"
|
||||||
to.tags = [tag]
|
|
||||||
container.mainClass = "play.core.server.ProdServerStart"
|
container.mainClass = "play.core.server.ProdServerStart"
|
||||||
}
|
}
|
|
@ -36,6 +36,5 @@ def tag = findProperty("tag") ?: new Date().format("yyyyMMdd.HHmmSS")
|
||||||
|
|
||||||
jib {
|
jib {
|
||||||
from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
|
from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
|
||||||
to.image = "open-telemetry-docker-dev.bintray.io/java/smoke-springboot-jdk$targetJDK"
|
to.image = "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$targetJDK-$tag"
|
||||||
to.tags = [tag]
|
|
||||||
}
|
}
|
|
@ -17,7 +17,7 @@ import spock.lang.Unroll
|
||||||
class GrpcSmokeTest extends SmokeTest {
|
class GrpcSmokeTest extends SmokeTest {
|
||||||
|
|
||||||
protected String getTargetImage(int jdk) {
|
protected String getTargetImage(int jdk) {
|
||||||
"open-telemetry-docker-dev.bintray.io/java/smoke-grpc-jdk$jdk:latest"
|
"ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$jdk-20201128.1734635"
|
||||||
}
|
}
|
||||||
|
|
||||||
@Unroll
|
@Unroll
|
||||||
|
|
|
@ -15,7 +15,7 @@ import okhttp3.Request
|
||||||
class JaegerExporterSmokeTest extends SmokeTest {
|
class JaegerExporterSmokeTest extends SmokeTest {
|
||||||
|
|
||||||
protected String getTargetImage(int jdk) {
|
protected String getTargetImage(int jdk) {
|
||||||
"open-telemetry-docker-dev.bintray.io/java/smoke-springboot-jdk$jdk:latest"
|
"ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20201128.1734635"
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -11,7 +11,7 @@ import okhttp3.Request
|
||||||
class PlaySmokeTest extends SmokeTest {
|
class PlaySmokeTest extends SmokeTest {
|
||||||
|
|
||||||
protected String getTargetImage(int jdk) {
|
protected String getTargetImage(int jdk) {
|
||||||
"open-telemetry-docker-dev.bintray.io/java/smoke-play-jdk$jdk:latest"
|
"ghcr.io/open-telemetry/java-test-containers:smoke-play-jdk$jdk-20201128.1734635"
|
||||||
}
|
}
|
||||||
|
|
||||||
def "play smoke test on JDK #jdk"(int jdk) {
|
def "play smoke test on JDK #jdk"(int jdk) {
|
||||||
|
|
|
@ -61,7 +61,7 @@ abstract class SmokeTest extends Specification {
|
||||||
private GenericContainer collector
|
private GenericContainer collector
|
||||||
|
|
||||||
def setupSpec() {
|
def setupSpec() {
|
||||||
backend = new GenericContainer<>("open-telemetry-docker-dev.bintray.io/java/smoke-fake-backend:latest")
|
backend = new GenericContainer<>("ghcr.io/open-telemetry/java-test-containers:smoke-fake-backend-20201128.1734635")
|
||||||
.withExposedPorts(8080)
|
.withExposedPorts(8080)
|
||||||
.waitingFor(Wait.forHttp("/health").forPort(8080))
|
.waitingFor(Wait.forHttp("/health").forPort(8080))
|
||||||
.withNetwork(network)
|
.withNetwork(network)
|
||||||
|
|
|
@ -17,7 +17,7 @@ import spock.lang.Unroll
|
||||||
class SpringBootSmokeTest extends SmokeTest {
|
class SpringBootSmokeTest extends SmokeTest {
|
||||||
|
|
||||||
protected String getTargetImage(int jdk) {
|
protected String getTargetImage(int jdk) {
|
||||||
"open-telemetry-docker-dev.bintray.io/java/smoke-springboot-jdk$jdk:20201120.373623860"
|
"ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20201128.1734635"
|
||||||
}
|
}
|
||||||
|
|
||||||
@Unroll
|
@Unroll
|
||||||
|
|
|
@ -15,7 +15,7 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest {
|
||||||
static final int ALLOWED_DEVIATION = 0.1 * NUM_TRIES
|
static final int ALLOWED_DEVIATION = 0.1 * NUM_TRIES
|
||||||
|
|
||||||
protected String getTargetImage(int jdk) {
|
protected String getTargetImage(int jdk) {
|
||||||
"open-telemetry-docker-dev.bintray.io/java/smoke-springboot-jdk$jdk:latest"
|
"ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20201128.1734635"
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -11,7 +11,7 @@ import okhttp3.Request
|
||||||
class ZipkinExporterSmokeTest extends SmokeTest {
|
class ZipkinExporterSmokeTest extends SmokeTest {
|
||||||
|
|
||||||
protected String getTargetImage(int jdk) {
|
protected String getTargetImage(int jdk) {
|
||||||
"open-telemetry-docker-dev.bintray.io/java/smoke-springboot-jdk$jdk:latest"
|
"ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20201128.1734635"
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue