diff --git a/.github/docker/vault/Dockerfile b/.github/docker/vault/Dockerfile index 3e2478c9..976af0ce 100644 --- a/.github/docker/vault/Dockerfile +++ b/.github/docker/vault/Dockerfile @@ -1,8 +1,7 @@ -FROM registry.scality.com/vault-dev/vault:c2607856 +FROM ghcr.io/scality/vault:c2607856 ENV VAULT_DB_BACKEND LEVELDB RUN chmod 400 tests/utils/keyfile ENTRYPOINT yarn start - diff --git a/.github/workflows/build-ci.yaml b/.github/workflows/build-ci.yaml index 3310cec5..3b413590 100644 --- a/.github/workflows/build-ci.yaml +++ b/.github/workflows/build-ci.yaml @@ -2,18 +2,13 @@ name: build-ci-images on: workflow_call: - secrets: - REGISTRY_LOGIN: - required: true - REGISTRY_PASSWORD: - required: true jobs: warp10-ci: - uses: scality/workflows/.github/workflows/docker-build.yaml@v1 + uses: scality/workflows/.github/workflows/docker-build.yaml@v2 secrets: REGISTRY_LOGIN: ${{ github.repository_owner }} - REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }} + REGISTRY_PASSWORD: ${{ github.token }} with: name: warp10-ci context: . @@ -21,22 +16,22 @@ jobs: lfs: true redis-ci: - uses: scality/workflows/.github/workflows/docker-build.yaml@v1 + uses: scality/workflows/.github/workflows/docker-build.yaml@v2 secrets: REGISTRY_LOGIN: ${{ github.repository_owner }} - REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }} + REGISTRY_PASSWORD: ${{ github.token }} with: name: redis-ci context: . file: images/redis/Dockerfile redis-replica-ci: - uses: scality/workflows/.github/workflows/docker-build.yaml@v1 + uses: scality/workflows/.github/workflows/docker-build.yaml@v2 needs: - redis-ci secrets: REGISTRY_LOGIN: ${{ github.repository_owner }} - REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }} + REGISTRY_PASSWORD: ${{ github.token }} with: name: redis-replica-ci context: .github/docker/redis-replica @@ -47,28 +42,21 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4 with: lfs: true - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1.6.0 + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Registry - uses: docker/login-action@v1.10.0 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Login to Scality Registry - uses: docker/login-action@v1.10.0 - with: - registry: registry.scality.com - username: ${{ secrets.REGISTRY_LOGIN }} - password: ${{ secrets.REGISTRY_PASSWORD }} + password: ${{ github.token }} - name: Build and push vault Image - uses: docker/build-push-action@v2.7.0 + uses: docker/build-push-action@v5 with: push: true context: .github/docker/vault diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index c6e83638..a87555c2 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -7,9 +7,10 @@ on: jobs: build-dev: - uses: scality/workflows/.github/workflows/docker-build.yaml@v1 - secrets: inherit + uses: scality/workflows/.github/workflows/docker-build.yaml@v2 + secrets: + REGISTRY_LOGIN: ${{ github.repository_owner }} + REGISTRY_PASSWORD: ${{ github.token }} with: - registry: registry.scality.com - namespace: utapi-dev - name: utapi + namespace: ${{ github.repository_owner }} + name: ${{ github.event.repository.name }} diff --git a/.github/workflows/release-warp10.yaml b/.github/workflows/release-warp10.yaml index 3da6baab..6b3ac648 100644 --- a/.github/workflows/release-warp10.yaml +++ b/.github/workflows/release-warp10.yaml @@ -15,11 +15,9 @@ on: jobs: build: - uses: scality/workflows/.github/workflows/docker-build.yaml@v1 + uses: scality/workflows/.github/workflows/docker-build.yaml@v2 secrets: inherit with: - registry: registry.scality.com - namespace: utapi name: warp10 context: . file: images/warp10/Dockerfile @@ -31,11 +29,11 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - uses: softprops/action-gh-release@v1 + - uses: softprops/action-gh-release@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: Release registry.scality.com/utapi/warp10:${{ github.event.inputs.tag }}-warp10 + name: Release utapi/warp10:${{ github.event.inputs.tag }}-warp10 tag_name: ${{ github.event.inputs.tag }}-warp10 generate_release_notes: false target_commitish: ${{ github.sha }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 636197de..4ae5a668 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,12 +22,11 @@ on: jobs: build: - uses: scality/workflows/.github/workflows/docker-build.yaml@v1 + uses: scality/workflows/.github/workflows/docker-build.yaml@v2 secrets: inherit with: - registry: registry.scality.com - namespace: utapi - name: utapi + namespace: ${{ github.repository_owner }} + name: ${{ github.event.repository.name }} context: . file: ${{ github.event.inputs.dockerfile}} tag: ${{ github.event.inputs.tag }} @@ -37,9 +36,9 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - uses: softprops/action-gh-release@v1 + - uses: softprops/action-gh-release@v2 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ github.token }} with: name: Release ${{ github.event.inputs.tag }} tag_name: ${{ github.event.inputs.tag }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index ece6e452..475475c0 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -9,18 +9,15 @@ on: jobs: build-ci: uses: ./.github/workflows/build-ci.yaml - secrets: - REGISTRY_LOGIN: ${{ secrets.REGISTRY_LOGIN }} - REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} lint: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: lfs: true - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: '16.13.2' cache: yarn @@ -110,24 +107,19 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: lfs: true - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: '16.13.2' cache: yarn - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: '3.9' - - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip + cache: pip - name: Install python deps - run: | - pip install requests - pip install redis + run: pip install -r requirements.txt - name: install dependencies run: yarn install --frozen-lockfile --network-concurrency 1 - name: ${{ matrix.test.name }} @@ -204,24 +196,19 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: lfs: true - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: '16.13.2' cache: yarn - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: '3.9' - - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip + cache: pip - name: Install python deps - run: | - pip install requests - pip install redis + run: pip install -r requirements.txt - name: install dependencies run: yarn install --frozen-lockfile --network-concurrency 1 - name: Wait for warp10 for 60 seconds @@ -233,9 +220,16 @@ jobs: UTAPI_SERVICE_USER_ENABLED: 'true' UTAPI_LOG_LEVEL: trace SETUP_CMD: "run start_v2:server" - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - if: failure() + - name: 'Debug: SSH to runner' + uses: scality/actions/action-ssh-to-runner@1.7.0 + timeout-minutes: ${{ fromJSON(github.event.inputs.connection-timeout-m) }} + continue-on-error: true + with: + tmate-server-host: ${{ secrets.TMATE_SERVER_HOST }} + tmate-server-port: ${{ secrets.TMATE_SERVER_PORT }} + tmate-server-rsa-fingerprint: ${{ secrets.TMATE_SERVER_RSA_FINGERPRINT }} + tmate-server-ed25519-fingerprint: ${{ secrets.TMATE_SERVER_ED25519_FINGERPRINT }} + if: ${{ ( github.event.inputs.debug == true || github.event.inputs.debug == 'true' ) }} tests-v2-without-sensision: needs: @@ -323,24 +317,19 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: lfs: true - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: '16.13.2' cache: yarn - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: '3.9' - - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip + cache: pip - name: Install python deps - run: | - pip install requests - pip install redis + run: pip install -r requirements.txt - name: install dependencies run: yarn install --frozen-lockfile --network-concurrency 1 - name: Wait for warp10 a little bit @@ -348,6 +337,13 @@ jobs: - name: ${{ matrix.test.name }} run: ${{ matrix.test.command }} env: ${{ matrix.test.env }} - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - if: failure() + - name: 'Debug: SSH to runner' + uses: scality/actions/action-ssh-to-runner@1.7.0 + timeout-minutes: ${{ fromJSON(github.event.inputs.connection-timeout-m) }} + continue-on-error: true + with: + tmate-server-host: ${{ secrets.TMATE_SERVER_HOST }} + tmate-server-port: ${{ secrets.TMATE_SERVER_PORT }} + tmate-server-rsa-fingerprint: ${{ secrets.TMATE_SERVER_RSA_FINGERPRINT }} + tmate-server-ed25519-fingerprint: ${{ secrets.TMATE_SERVER_ED25519_FINGERPRINT }} + if: ${{ ( github.event.inputs.debug == true || github.event.inputs.debug == 'true' ) }} diff --git a/images/nodesvc-base/Dockerfile b/images/nodesvc-base/Dockerfile index 8ac6ed0d..2f0fb3b6 100644 --- a/images/nodesvc-base/Dockerfile +++ b/images/nodesvc-base/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.scality.com/federation/nodesvc-base:7.10.5.0 +FROM ghcr.io/scality/federation/nodesvc-base:7.10.5.0 ENV UTAPI_CONFIG_FILE=${CONF_DIR}/config.json diff --git a/images/warp10/Dockerfile b/images/warp10/Dockerfile index d12feee0..c068914f 100644 --- a/images/warp10/Dockerfile +++ b/images/warp10/Dockerfile @@ -13,7 +13,7 @@ RUN apk add zip unzip build-base \ && cd .. \ && go build -a -o /usr/local/go/warp10_sensision_exporter -FROM registry.scality.com/utapi/warp10:2.8.1-95-g73e7de80 +FROM ghcr.io/scality/utapi/warp10:2.8.1-95-g73e7de80 # Override baked in version # Remove when updating to a numbered release diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..d3bf589d --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +redis==5.0.3 +requests==2.31.0 \ No newline at end of file