diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index f55cc04..e764392 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -5,9 +5,7 @@ on: # build and push anytime commits are merged to devel branches: - devel - schedule: - # build every 12 hours - - cron: '0 */12 * * *' + workflow_dispatch: jobs: build_and_push_latest: @@ -29,9 +27,9 @@ jobs: env: DOCKER_BUILDKIT: 1 run: | - tox -e docker -- --tag=quay.io/ansible/awx-ee:latest + tox -e docker -- --tag=saltydk/awx-ee:dev - 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.DOCKER_TOKEN }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin + docker push quay.io/ansible/awx-ee:dev diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index f6cabe0..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- - -name: CI - -on: - pull_request: - branches: [devel] - - push: - branches: [devel] - -jobs: - podman: - runs-on: ubuntu-20.04 - name: Podman - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-python@v2 - with: - python-version: "3.9" - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install tox - - - name: Build EE with Podman - run: | - tox -e podman - - docker: - runs-on: ubuntu-20.04 - name: Docker - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-python@v2 - with: - python-version: "3.9" - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install tox - - - name: Build EE with Docker - env: - DOCKER_BUILDKIT: 1 - run: | - tox -e docker diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 8ce250e..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Release - -on: - release: - types: - - created - -jobs: - release: - runs-on: ubuntu-20.04 - name: Release - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-python@v2 - with: - python-version: "3.9" - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install tox - - - name: Build image - env: - DOCKER_BUILDKIT: 1 - run: | - tox -e docker -- --tag=quay.io/ansible/awx-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 - - - 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 diff --git a/.github/workflows/triage_new.yml b/.github/workflows/triage_new.yml deleted file mode 100644 index f032d19..0000000 --- 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/execution-environment.yml b/execution-environment.yml index ac1431c..04ce78c 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -18,6 +18,9 @@ dependencies: - name: theforeman.foreman - name: google.cloud - name: openstack.cloud + - name: community.aws + - name: community.docker + - name: community.general - name: community.vmware - name: ovirt.ovirt - name: kubernetes.core diff --git a/tox.ini b/tox.ini index 8c70507..db01549 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ allowlist_externals = /bin/bash podman commands = - /bin/bash -c "podman rmi quay.io/ansible/awx-ee:latest || true" + /bin/bash -c "podman rmi saltydk/awx-ee:dev || true" ansible-builder build -v3 -t quay.io/ansible/awx-ee {posargs} [testenv:docker] @@ -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 saltydk/awx-ee:dev || true" + ansible-builder build -v3 -t saltydk/awx-ee {posargs} --container-runtime=docker