Skip to content

Commit ac81d50

Browse files
authored
Fix docker test (#3356)
* Update dockerTests.yml * Update dockerTests.yml * Update dockerTests.yml * Update dockerTests.yml * Update dockerTests.yml * Update dockerTests.yml * Update dockerTests.yml * Update dockerTests.yml * Update podmanTests.yml
1 parent 4d976ab commit ac81d50

File tree

2 files changed

+28
-8
lines changed

2 files changed

+28
-8
lines changed

.github/workflows/dockerTests.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@ jobs:
3030
with:
3131
ref: ${{ github.event.pull_request.head.sha || github.ref }}
3232

33+
- name: Configure Docker 29 for Legacy Support
34+
run: |
35+
sudo bash -c 'cat <<EOF > /etc/docker/daemon.json
36+
{
37+
"insecure-registries": ["localhost:8082"],
38+
"features": {
39+
"containerd-snapshotter": false
40+
}
41+
}
42+
EOF'
43+
sudo systemctl restart docker
44+
3345
- name: Setup FastCI
3446
uses: jfrog-fastci/fastci@v0
3547
with:
@@ -48,13 +60,9 @@ jobs:
4860
RTLIC: ${{secrets.RTLIC}}
4961
GOPROXY: direct
5062

51-
- name: Wait for Artifactory to finish loading
52-
uses: nev7n/wait_for_response@v1
53-
with:
54-
url: "http://localhost:8082"
55-
responseCode: 200
56-
timeout: 600000
57-
interval: 500
63+
- name: Wait for Artifactory (Native)
64+
run: |
65+
timeout 600s bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8082)" != "200" ]]; do sleep 5; done'
5866
5967
- name: Run Docker tests
6068
run: go test -v -timeout 0 --test.docker

.github/workflows/podmanTests.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@ jobs:
3030
with:
3131
ref: ${{ github.event.pull_request.head.sha || github.ref }}
3232

33+
- name: Configure Docker 29 for Legacy Support
34+
run: |
35+
sudo bash -c 'cat <<EOF > /etc/docker/daemon.json
36+
{
37+
"insecure-registries": ["localhost:8082"],
38+
"features": {
39+
"containerd-snapshotter": false
40+
}
41+
}
42+
EOF'
43+
sudo systemctl restart docker
44+
3345
- name: Setup FastCI
3446
uses: jfrog-fastci/fastci@v0
3547
with:
@@ -40,4 +52,4 @@ jobs:
4052
uses: jfrog/.github/actions/install-go-with-cache@main
4153

4254
- name: Run podman tests
43-
run: go test -v -timeout 0 --test.podman --jfrog.url=${{ secrets.EPLUS_PLATFORM_URL }} --jfrog.adminToken=${{ secrets.EPLUS_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }}
55+
run: go test -v -timeout 0 --test.podman --jfrog.url=${{ secrets.EPLUS_PLATFORM_URL }} --jfrog.adminToken=${{ secrets.EPLUS_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }}

0 commit comments

Comments
 (0)