9 changed files with 84 additions and 67 deletions
--- a/.github/docker/vault/Dockerfile
+++ b/.github/docker/vault/Dockerfile
@ -1,7 +1,8 @@
-FROM ghcr.io/scality/vault:c2607856
+FROM registry.scality.com/vault-dev/vault:c2607856

 ENV VAULT_DB_BACKEND LEVELDB

 RUN chmod 400 tests/utils/keyfile

 ENTRYPOINT yarn start
+
--- a/.github/workflows/build-ci.yaml
+++ b/.github/workflows/build-ci.yaml
@ -2,13 +2,18 @@ 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@v2
+    uses: scality/workflows/.github/workflows/docker-build.yaml@v1
    secrets:
      REGISTRY_LOGIN: ${{ github.repository_owner }}
-      REGISTRY_PASSWORD: ${{ github.token }}
+      REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
    with:
      name: warp10-ci
      context: .
@ -16,22 +21,22 @@ jobs:
      lfs: true

  redis-ci:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
+    uses: scality/workflows/.github/workflows/docker-build.yaml@v1
    secrets:
      REGISTRY_LOGIN: ${{ github.repository_owner }}
-      REGISTRY_PASSWORD: ${{ github.token }}
+      REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
    with:
      name: redis-ci
      context: .
      file: images/redis/Dockerfile

  redis-replica-ci:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
+    uses: scality/workflows/.github/workflows/docker-build.yaml@v1
    needs:
      - redis-ci
    secrets:
      REGISTRY_LOGIN: ${{ github.repository_owner }}
-      REGISTRY_PASSWORD: ${{ github.token }}
+      REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
    with:
      name: redis-replica-ci
      context: .github/docker/redis-replica
@ -42,21 +47,28 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2.3.4
        with:
          lfs: true

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1.6.0
      - name: Login to GitHub Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1.10.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
-          password: ${{ github.token }}
+          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 }}

      - name: Build and push vault Image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v2.7.0
        with:
          push: true
          context: .github/docker/vault
--- a/.github/workflows/build-dev.yaml
+++ b/.github/workflows/build-dev.yaml
@ -7,10 +7,9 @@ on:

 jobs:
  build-dev:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
-    secrets:
-      REGISTRY_LOGIN: ${{ github.repository_owner }}
-      REGISTRY_PASSWORD: ${{ github.token }}
+    uses: scality/workflows/.github/workflows/docker-build.yaml@v1
+    secrets: inherit
    with:
-      namespace: ${{ github.repository_owner }}
-      name: ${{ github.event.repository.name }}
+      registry: registry.scality.com
+      namespace: utapi-dev
+      name: utapi
--- a/.github/workflows/release-warp10.yaml
+++ b/.github/workflows/release-warp10.yaml
@ -15,9 +15,11 @@ on:

 jobs:
  build:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
+    uses: scality/workflows/.github/workflows/docker-build.yaml@v1
    secrets: inherit
    with:
+      registry: registry.scality.com
+      namespace: utapi
      name: warp10
      context: .
      file: images/warp10/Dockerfile
@ -29,11 +31,11 @@ jobs:
    runs-on: ubuntu-latest
    needs: build
    steps:
-      - uses: softprops/action-gh-release@v2
+      - uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
-          name: Release utapi/warp10:${{ github.event.inputs.tag }}-warp10
+          name: Release registry.scality.com/utapi/warp10:${{ github.event.inputs.tag }}-warp10
          tag_name: ${{ github.event.inputs.tag }}-warp10
          generate_release_notes: false
          target_commitish: ${{ github.sha }}
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -22,11 +22,12 @@ on:

 jobs:
  build:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
+    uses: scality/workflows/.github/workflows/docker-build.yaml@v1
    secrets: inherit
    with:
-      namespace: ${{ github.repository_owner }}
-      name: ${{ github.event.repository.name }}
+      registry: registry.scality.com
+      namespace: utapi
+      name: utapi
      context: .
      file: ${{ github.event.inputs.dockerfile}}
      tag: ${{ github.event.inputs.tag }}
@ -36,9 +37,9 @@ jobs:
    runs-on: ubuntu-latest
    needs: build
    steps:
-      - uses: softprops/action-gh-release@v2
+      - uses: softprops/action-gh-release@v1
        env:
-          GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          name: Release ${{ github.event.inputs.tag }}
          tag_name: ${{ github.event.inputs.tag }}
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@ -9,15 +9,18 @@ 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@v4
+      uses: actions/checkout@v2
      with:
        lfs: true
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v2
      with:
        node-version: '16.13.2'
        cache: yarn
@ -107,19 +110,24 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
      with:
        lfs: true
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v2
      with:
        node-version: '16.13.2'
        cache: yarn
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v2
      with:
        python-version: '3.9'
-        cache: pip
+    - uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip
    - name: Install python deps
-      run: pip install -r requirements.txt
+      run: |
+        pip install requests
+        pip install redis
    - name: install dependencies
      run: yarn install --frozen-lockfile --network-concurrency 1
    - name: ${{ matrix.test.name }}
@ -196,19 +204,24 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
      with:
        lfs: true
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v2
      with:
        node-version: '16.13.2'
        cache: yarn
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v2
      with:
        python-version: '3.9'
-        cache: pip
+    - uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip
    - name: Install python deps
-      run: pip install -r requirements.txt
+      run: |
+        pip install requests
+        pip install redis
    - name: install dependencies
      run: yarn install --frozen-lockfile --network-concurrency 1
    - name: Wait for warp10 for 60 seconds
@ -220,16 +233,9 @@ jobs:
        UTAPI_SERVICE_USER_ENABLED: 'true'
        UTAPI_LOG_LEVEL: trace
        SETUP_CMD: "run start_v2:server"
-    - 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' ) }}
+    - name: Setup tmate session
+      uses: mxschmitt/action-tmate@v3
+      if: failure()

  tests-v2-without-sensision:
    needs:
@ -317,19 +323,24 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
      with:
        lfs: true
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v2
      with:
        node-version: '16.13.2'
        cache: yarn
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v2
      with:
        python-version: '3.9'
-        cache: pip
+    - uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip
    - name: Install python deps
-      run: pip install -r requirements.txt
+      run: |
+        pip install requests
+        pip install redis
    - name: install dependencies
      run: yarn install --frozen-lockfile --network-concurrency 1
    - name: Wait for warp10 a little bit
@ -337,13 +348,6 @@ jobs:
    - name: ${{ matrix.test.name }}
      run: ${{ matrix.test.command }}
      env: ${{ matrix.test.env }}
-    - 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' ) }}
+    - name: Setup tmate session
+      uses: mxschmitt/action-tmate@v3
+      if: failure()
--- a/images/nodesvc-base/Dockerfile
+++ b/images/nodesvc-base/Dockerfile
@ -1,4 +1,4 @@
-FROM ghcr.io/scality/federation/nodesvc-base:7.10.5.0
+FROM registry.scality.com/federation/nodesvc-base:7.10.5.0

 ENV UTAPI_CONFIG_FILE=${CONF_DIR}/config.json

--- 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 ghcr.io/scality/utapi/warp10:2.8.1-95-g73e7de80
+FROM registry.scality.com/utapi/warp10:2.8.1-95-g73e7de80

 # Override baked in version
 # Remove when updating to a numbered release
--- a/requirements.txt
+++ b/requirements.txt
@ -1,2 +0,0 @@
-redis==5.0.3
-requests==2.31.0