diff --git a/.github/issue_labeler.yml b/.github/issue_labeler.yml deleted file mode 100644 index 0821bc8f..00000000 --- a/.github/issue_labeler.yml +++ /dev/null @@ -1,2 +0,0 @@ -needs_triage: - - '.*' diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index f55cc041..c39ac414 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -4,7 +4,7 @@ on: push: # build and push anytime commits are merged to devel branches: - - devel + - main schedule: # build every 12 hours - cron: '0 */12 * * *' @@ -29,9 +29,9 @@ jobs: env: DOCKER_BUILDKIT: 1 run: | - tox -e docker -- --tag=quay.io/ansible/awx-ee:latest + tox -e docker -- --tag=ghcr.io/${{ github.repository_owner }}/ascender-ee:latest - name: Push images run: | - echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin - docker push quay.io/ansible/awx-ee:latest + echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin + docker push ghcr.io/${{ github.repository_owner }}/ascender-ee:latest diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6cabe0d..527f5bb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,10 +4,10 @@ name: CI on: pull_request: - branches: [devel] + branches: [main] push: - branches: [devel] + branches: [main] jobs: podman: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ce250e5..94b2b885 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,14 +25,14 @@ jobs: env: DOCKER_BUILDKIT: 1 run: | - tox -e docker -- --tag=quay.io/ansible/awx-ee:${{ github.event.release.tag_name }} + tox -e docker -- --tag=ghcr.io/ctrliq/ascender-ee:${{ github.event.release.tag_name }} - name: Apply latest tag run: | - docker tag quay.io/ansible/awx-ee:${{ github.event.release.tag_name }} quay.io/ansible/awx-ee:latest + docker tag ghcr.io/${{ github.repository_owner }}/ascender-ee:${{ github.event.release.tag_name }} ghcr.io/${{ github.repository_owner }}/ascender-ee:latest - name: Push images run: | - echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin - docker push quay.io/ansible/awx-ee:${{ github.event.release.tag_name }} - docker push quay.io/ansible/awx-ee:latest + echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin + docker push ghcr.io/${{ github.repository_owner }}/ascender-ee:${{ github.event.release.tag_name }} + docker push ghcr.io/${{ github.repository_owner }}/ascender-ee:latest diff --git a/.github/workflows/triage_new.yml b/.github/workflows/triage_new.yml deleted file mode 100644 index f032d193..00000000 --- a/.github/workflows/triage_new.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Triage - -on: - issues: - types: - - opened - -jobs: - triage: - runs-on: ubuntu-latest - name: Label - - steps: - - name: Label issues - uses: github/issue-labeler@v2.4.1 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - not-before: 2021-12-07T07:00:00Z - configuration-path: .github/issue_labeler.yml - enable-versioned-regex: 0 - if: github.event_name == 'issues' diff --git a/README.md b/README.md index a8e40b36..fa0726f2 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,5 @@ First, [install ansible-builder](https://ansible-builder.readthedocs.io/en/stabl Then run the following command from the root of this repo: ```bash -$ ansible-builder build -v3 -t quay.io/ansible/awx-ee # --container-runtime=docker # Is podman by default +$ ansible-builder build -v3 -t ghcr.io/ctrliq/ascender-ee # --container-runtime=docker # Is podman by default ``` diff --git a/execution-environment.yml b/execution-environment.yml index 823b2ee4..fd0bf4bf 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -2,7 +2,7 @@ version: 3 images: base_image: - name: quay.io/centos/centos:stream9 + name: rockylinux:9 dependencies: ansible_core: # Require minimum of 2.15 to get ansible-inventory --limit option @@ -23,9 +23,10 @@ dependencies: - name: kubernetes.core - name: ansible.posix - name: ansible.windows - - name: redhatinsights.insights system: | git-core [platform:rpm] + gcc [platform:rpm] + gcc-c++ [platform:rpm] python3.9-devel [platform:rpm compile] libcurl-devel [platform:rpm compile] krb5-devel [platform:rpm compile] diff --git a/tox.ini b/tox.ini index 8c705075..f1877634 100644 --- a/tox.ini +++ b/tox.ini @@ -13,8 +13,8 @@ allowlist_externals = /bin/bash podman commands = - /bin/bash -c "podman rmi quay.io/ansible/awx-ee:latest || true" - ansible-builder build -v3 -t quay.io/ansible/awx-ee {posargs} + /bin/bash -c "podman rmi ghcr.io/ctrliq/ascender-ee:latest || true" + ansible-builder build -v3 -t ghcr.io/ctrliq/ascender-ee {posargs} [testenv:docker] passenv = HOME,DOCKER_BUILDKIT @@ -22,5 +22,5 @@ allowlist_externals = /bin/bash docker commands = - /bin/bash -c "docker rmi quay.io/ansible/awx-ee:latest || true" - ansible-builder build -v3 -t quay.io/ansible/awx-ee {posargs} --container-runtime=docker + /bin/bash -c "docker rmi ghcr.io/ctrliq/ascender-ee:latest || true" + ansible-builder build -v3 -t ghcr.io/ctrliq/ascender-ee {posargs} --container-runtime=docker