Skip to content

Commit 09f0d49

Browse files
committed
revert CI
1 parent a26a559 commit 09f0d49

File tree

9 files changed

+33
-54
lines changed

9 files changed

+33
-54
lines changed

.github/workflows/ci-docker-compose-integration.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
pull_request:
55
branches:
66
- '**'
7-
# push:
8-
# branches:
9-
# - '**'
7+
push:
8+
branches:
9+
- '**'
1010
workflow_dispatch:
1111

1212
jobs:
@@ -25,7 +25,7 @@ jobs:
2525
- TEST_PROFILE: insights
2626
# - TEST_PROFILE: iqe_rbac
2727
# - TEST_PROFILE: x_repo_search
28-
# - TEST_PROFILE: community
28+
- TEST_PROFILE: community
2929
# - TEST_PROFILE: dab_jwt
3030

3131
runs-on: ubuntu-latest
@@ -45,18 +45,6 @@ jobs:
4545
run: |
4646
docker compose -f dev/compose/${{ matrix.env.TEST_PROFILE }}.yaml up --detach
4747
48-
- name: ls /tmp, whoami, id
49-
run: |
50-
ls -la /tmp;
51-
whoami;
52-
id
53-
54-
- run: docker compose -f dev/compose/${{ matrix.env.TEST_PROFILE }}.yaml exec manager /bin/bash -c 'ls -la /tmp'
55-
56-
- run: docker compose -f dev/compose/${{ matrix.env.TEST_PROFILE }}.yaml exec manager /bin/bash -c 'whoami'
57-
58-
- run: docker compose -f dev/compose/${{ matrix.env.TEST_PROFILE }}.yaml exec manager /bin/bash -c 'id'
59-
6048
- name: Export environment variables to host
6149
run: |
6250
docker compose -f dev/compose/${{ matrix.env.TEST_PROFILE }}.yaml exec manager /bin/bash -c 'env | grep -v -w "HOME"' >> $GITHUB_ENV

.github/workflows/ci_automation_hub_collection.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
22
name: Galaxy Collection CI
33
on:
4-
# pull_request:
5-
# branches:
6-
# - "*"
7-
# paths-ignore:
8-
# - "CHANGES/**"
9-
# - "docs/**"
10-
# - "mkdocs.yml"
11-
# push:
12-
# branches:
13-
# - "*"
4+
pull_request:
5+
branches:
6+
- "*"
7+
paths-ignore:
8+
- "CHANGES/**"
9+
- "docs/**"
10+
- "mkdocs.yml"
11+
push:
12+
branches:
13+
- "*"
1414
workflow_dispatch:
1515

1616
jobs:

.github/workflows/ci_full.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
name: galaxy_ng/ci
33
on:
44
workflow_dispatch:
5-
# - push
6-
# - pull_request
5+
- push
6+
- pull_request
77

88
jobs:
99

.github/workflows/ci_oci-env-integration.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
name: OCI Env Integration
33
on:
4-
# pull_request:
5-
# branches:
6-
# - '**'
7-
# push:
8-
# branches:
9-
# - '**'
4+
pull_request:
5+
branches:
6+
- '**'
7+
push:
8+
branches:
9+
- '**'
1010
workflow_dispatch:
1111

1212
jobs:
@@ -22,7 +22,7 @@ jobs:
2222
- TEST_PROFILE: rbac_parallel_group_1
2323
- TEST_PROFILE: rbac_parallel_group_2
2424
- TEST_PROFILE: certified-sync
25-
- TEST_PROFILE: insights
25+
# - TEST_PROFILE: insights
2626
- TEST_PROFILE: iqe_rbac
2727
- TEST_PROFILE: x_repo_search
2828
# - TEST_PROFILE: community

.github/workflows/ci_tdd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
name: TDD
33
on:
4-
# pull_request:
5-
# branches:
6-
# - '*'
4+
pull_request:
5+
branches:
6+
- '*'
77
workflow_dispatch:
88

99
jobs:

.github/workflows/sonar-pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
name: SonarCloud
55
on:
66
workflow_run:
7-
# workflows:
8-
# - galaxy_ng/ci
7+
workflows:
8+
- galaxy_ng/ci
99
types:
1010
- completed
1111
jobs:

dev/compose/community.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ x-common-env: &common-env
8585
# To enable editable to install local checkouts set DEV_SOURCE_PATH keeping the ordering as follows:
8686
# "dynaconf:pulpcore:galaxy_importer:pulp_ansible:pulp_container:galaxy_ng:django-ansible-base"
8787
# This can be done as part of the `docker compose` call:
88-
# $ DEV_SOURCE_PATH="pulp_container:galaxy_ng" docker compose -f dev/compose/aap.yaml up
88+
# $ DEV_SOURCE_PATH="pulp_container:galaxy_ng" docker compose -f dev/compose/community.yaml up
8989
DEV_SOURCE_PATH:
9090

9191

dev/compose/insights.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ x-common-env: &common-env
2828
PULP_DEFAULT_FILE_STORAGE: "pulpcore.app.models.storage.FileSystem"
2929
PULP_REDIRECT_TO_OBJECT_STORAGE: 'false'
3030

31-
# required for collection download
31+
# collection download
3232
PULP_X_PULP_CONTENT_HOST: content
3333
PULP_X_PULP_CONTENT_PORT: 24816
3434

@@ -64,7 +64,6 @@ x-common-env: &common-env
6464
# Integration test settings
6565
HUB_AUTH_URL: 'http://localhost:8080/auth/realms/redhat-external/protocol/openid-connect/token'
6666
HUB_API_ROOT: 'http://localhost:8080/api/automation-hub/'
67-
# HUB_UPLOAD_SIGNATURES: "true"
6867
HUB_USE_MOVE_ENDPOINT: "true"
6968

7069

@@ -74,19 +73,18 @@ x-common-env: &common-env
7473
# Unpin dependencies on setup.py if set to 0
7574
LOCK_REQUIREMENTS: 0
7675

77-
7876
# DEV EDITABLE STUFF
7977
# To enable editable to install local checkouts set DEV_SOURCE_PATH keeping the ordering as follows:
8078
# "dynaconf:pulpcore:galaxy_importer:pulp_ansible:pulp_container:galaxy_ng:django-ansible-base"
8179
# This can be done as part of the `docker compose` call:
8280
# $ DEV_SOURCE_PATH="pulp_container:galaxy_ng" docker compose -f dev/compose/insights.yaml up
83-
DEV_SOURCE_PATH: 'galaxy_ng'
81+
DEV_SOURCE_PATH:
8482

8583
# allow attaching to the running container
8684
x-debugging: &debugging
8785
stdin_open: true
8886
tty: true
89-
87+
9088
services:
9189
base_img:
9290
build:
@@ -114,7 +112,6 @@ services:
114112
PROXY_PORT: "8080"
115113
volumes:
116114
- "../../profiles/insights/proxy:/app:ro"
117-
# - '/tmp:/tmp:rw'
118115

119116
redis:
120117
image: "redis:5"
@@ -143,7 +140,6 @@ services:
143140
- "var_lib_pulp:/var/lib/pulp"
144141
- "../../../:/src"
145142
- "../../:/app"
146-
# - '/tmp:/tmp:rw'
147143
environment:
148144
<<: *common-env
149145
user: root
@@ -173,7 +169,6 @@ services:
173169
- "var_lib_pulp:/var/lib/pulp"
174170
- "../../../:/src"
175171
- "../../:/app"
176-
# - '/tmp:/tmp:rw'
177172
environment:
178173
<<: *common-env
179174
extra_hosts:
@@ -201,7 +196,6 @@ services:
201196
- "var_lib_pulp:/var/lib/pulp"
202197
- "../../../:/src"
203198
- "../../:/app"
204-
# - '/tmp:/tmp:rw'
205199
environment:
206200
<<: *common-env
207201
extra_hosts:
@@ -229,7 +223,6 @@ services:
229223
- "var_lib_pulp:/var/lib/pulp"
230224
- "../../../:/src"
231225
- "../../:/app"
232-
# - '/tmp:/tmp:rw'
233226
environment:
234227
<<: *common-env
235228
user: root
@@ -257,7 +250,6 @@ services:
257250
- "var_lib_pulp:/var/lib/pulp"
258251
- "../../../:/src"
259252
- "../../:/app"
260-
# - '/tmp:/tmp:rw'
261253
environment:
262254
<<: *common-env
263255
user: root
@@ -304,7 +296,6 @@ services:
304296
- '5001:5001'
305297
volumes:
306298
- '../nginx/nginx.conf:/etc/nginx/nginx.conf:ro'
307-
# - '/tmp:/tmp:rw'
308299

309300
volumes:
310301
var_lib_pulp:

galaxy_ng/tests/integration/api/test_artifact_download.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def test_download_artifact(ansible_config, galaxy_client):
7575
# TODO(awcrosby): make download logic more DRY in these tests
7676
@pytest.mark.min_hub_version("4.6dev")
7777
@pytest.mark.all
78-
def test_download_artifact_validated(ansible_config, galaxy_client, docker_compose_exec):
78+
def test_download_artifact_validated(ansible_config, galaxy_client):
7979
# gc = galaxy_client("partner_engineer")
8080
gc = galaxy_client("admin")
8181

0 commit comments

Comments
 (0)