Skip to content

Commit

Permalink
updates for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
busma13 committed Jul 8, 2024
1 parent 790b516 commit 5f08d07
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ jobs:
with:
path: /tmp/docker_cache
key: docker-images-${{ hashFiles('./images/image-list.txt') }}
restore-keys: |
docker-images-
# restore-keys: |
# docker-images-

- name: Pull and save Docker images
if: ${{steps.docker-cache.outputs.cache-hit != 'true'}}
Expand Down Expand Up @@ -189,8 +189,8 @@ jobs:
with:
path: /tmp/docker_cache
key: docker-images-${{ hashFiles('./images/image-list.txt') }}
restore-keys: |
docker-images-
# restore-keys: |
# docker-images-

- name: Decompress and load Docker images from cache
if: ${{steps.docker-cache.outputs.cache-hit == 'true'}}
Expand All @@ -201,12 +201,12 @@ jobs:
gzip -dc "$tar_gz" | docker load
done
- name: Pull Docker images if cache is not hit
if: ${{steps.docker-cache.outputs.cache-hit != 'true'}}
run: |
while IFS= read -r image; do
docker pull "$image"
done < image-list.txt
# - name: Pull Docker images if cache is not hit
# if: ${{steps.docker-cache.outputs.cache-hit != 'true'}}
# run: |
# while IFS= read -r image; do
# docker pull "$image"
# done < image-list.txt

- name: Test ${{ matrix.search-version }}
run: yarn --silent test:${{ matrix.search-version }}
Expand Down
18 changes: 9 additions & 9 deletions packages/scripts/src/helpers/images/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ export async function images(action: ImagesAction): Promise<void> {
*/
async function createImageList(imagesPath: string): Promise<void> {
const list = 'terascope/node-base:18.19.1\n'
+ 'terascope/node-base:20.11.1\n'
+ 'terascope/node-base:22.2.0\n'
+ `${config.ELASTICSEARCH_DOCKER_IMAGE}:6.8.6\n`
+ `${config.ELASTICSEARCH_DOCKER_IMAGE}:7.9.3\n`
+ `${config.OPENSEARCH_DOCKER_IMAGE}:1.3.10\n`
+ `${config.OPENSEARCH_DOCKER_IMAGE}:2.8.0\n`
+ `${config.KAFKA_DOCKER_IMAGE}:3.1\n`
+ `${config.ZOOKEEPER_DOCKER_IMAGE}:3.1\n`
+ `${config.MINIO_DOCKER_IMAGE}:RELEASE.2020-02-07T23-28-16Z\n`;
// + 'terascope/node-base:20.11.1\n'
// + 'terascope/node-base:22.2.0\n'
+ `${config.ELASTICSEARCH_DOCKER_IMAGE}:6.8.6`;
// + `${config.ELASTICSEARCH_DOCKER_IMAGE}:7.9.3\n`
// + `${config.OPENSEARCH_DOCKER_IMAGE}:1.3.10\n`
// + `${config.OPENSEARCH_DOCKER_IMAGE}:2.8.0\n`
// + `${config.KAFKA_DOCKER_IMAGE}:3.1\n`
// + `${config.ZOOKEEPER_DOCKER_IMAGE}:3.1\n`
// + `${config.MINIO_DOCKER_IMAGE}:RELEASE.2020-02-07T23-28-16Z\n`;
if (!fse.existsSync(imagesPath)) {
await fse.emptyDir(imagesPath);
}
Expand Down

0 comments on commit 5f08d07

Please sign in to comment.