Rename the demo data to seed data (#932)

Without it the cuebot will not run jobs. Renaming it to seed will make it cleaner it's needed but will likely need to be changed after starting. Co-authored-by: Lars van der Bijl <[email protected]>
AcademySoftwareFoundation · Apr 2, 2021 · 64ce8a4 · 64ce8a4
1 parent 4195ddd
commit 64ce8a4
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/packaging-pipeline.yml b/.github/workflows/packaging-pipeline.yml
@@ -140,7 +140,7 @@ jobs:
  aws s3 cp LICENSE s3://${S3_BUCKET}/opencue/${BUILD_ID}/
  aws s3 cp VERSION s3://${S3_BUCKET}/opencue/${BUILD_ID}/
  aws s3 cp "${GITHUB_WORKSPACE}/artifacts/schema-${BUILD_ID}.sql" s3://${S3_BUCKET}/opencue/${BUILD_ID}/
- aws s3 cp "${GITHUB_WORKSPACE}/artifacts/demo_data-${BUILD_ID}.sql" s3://${S3_BUCKET}/opencue/${BUILD_ID}/
+ aws s3 cp "${GITHUB_WORKSPACE}/artifacts/seed_data-${BUILD_ID}.sql" s3://${S3_BUCKET}/opencue/${BUILD_ID}/
  aws s3 cp "${GITHUB_WORKSPACE}/artifacts/build_metadata.json" s3://${S3_BUCKET}/opencue/${BUILD_ID}/
 
  - name: Display artifacts

diff --git a/.github/workflows/release-pipeline.yml b/.github/workflows/release-pipeline.yml
@@ -161,8 +161,8 @@ jobs:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:
  upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ${{ github.workspace }}/artifacts/demo_data-${{ env.BUILD_ID }}.sql
- asset_name: demo_data-${{ env.BUILD_ID }}.sql
+ asset_path: ${{ github.workspace }}/artifacts/seed_data-${{ env.BUILD_ID }}.sql
+ asset_name: seed_data-${{ env.BUILD_ID }}.sql
  asset_content_type: application/octet-stream
 
  - name: Upload Cuebot JAR

diff --git a/ci/extract_schema.sh b/ci/extract_schema.sh
@@ -34,7 +34,7 @@ docker exec -t --user=${DB_USER} ${PG_CONTAINER} pg_dump --no-privileges --no-ow
  | tee "${ARTIFACT_DIRECTORY}/schema-${BUILD_ID}.sql"
 
 # The demo data gets its own build artifact too.
-cp "${SCHEMA_DIRECTORY}/demo_data.sql" "${ARTIFACT_DIRECTORY}/demo_data-${BUILD_ID}.sql"
+cp "${SCHEMA_DIRECTORY}/seed_data.sql" "${ARTIFACT_DIRECTORY}/seed_data-${BUILD_ID}.sql"
 
 docker kill ${FLYWAY_CONTAINER}
 docker kill ${PG_CONTAINER}
diff --git a/cuebot/oracle/xe/run_db_container.sh b/cuebot/oracle/xe/run_db_container.sh
@@ -12,7 +12,7 @@ ORACLE_RPM="oracle-xe-11.2.0-1.0.x86_64.rpm.zip"
 ORACLE_DOCKER_REPO="https://github.com/oracle/docker-images.git"
 DOCKER_NAME="oracle-xe"
 ORACLE_SQL_FILE='/tmp/oracle_ddl/schema.sql'
-ORACLE_SQL_DATA_FILE='/tmp/oracle_ddl/demo_data.sql'
+ORACLE_SQL_DATA_FILE='/tmp/oracle_ddl/seed_data.sql'
 CUE_DB_USER='CUE'
 
 
@@ -54,7 +54,7 @@ if [ "$3" = "--build-prod" ]; then
  echo "Applying Schema..."
  docker exec oracle-xe /bin/bash -c "mkdir $(dirname $ORACLE_SQL_FILE)"
  docker cp ${CUEBOT_ROOT_DIRECTORY}/src/main/resources/conf/ddl/oracle/schema.sql oracle-xe:$ORACLE_SQL_FILE
- docker cp ${CUEBOT_ROOT_DIRECTORY}/src/test/resources/conf/ddl/oracle/demo_data.sql oracle-xe:$ORACLE_SQL_DATA_FILE
+ docker cp ${CUEBOT_ROOT_DIRECTORY}/src/test/resources/conf/ddl/oracle/seed_data.sql oracle-xe:$ORACLE_SQL_DATA_FILE
  docker cp ${CUEBOT_ROOT_DIRECTORY}/oracle/xe/apply_schema.sh oracle-xe:/tmp/
  docker cp ${CUEBOT_ROOT_DIRECTORY}/oracle/xe/apply_schema.py oracle-xe:/tmp/
  docker exec oracle-xe /bin/bash -c "/tmp/apply_schema.sh $2 $CUE_DB_USER $ORACLE_SQL_FILE $ORACLE_SQL_DATA_FILE"

diff --git a/...resources/conf/ddl/postgres/demo_data.sql → ...resources/conf/ddl/postgres/seed_data.sql b/...resources/conf/ddl/postgres/demo_data.sql → ...resources/conf/ddl/postgres/seed_data.sql
@@ -63,8 +63,6 @@ Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,
 
 Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,STR_TAGS) values ('AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAA7','katana',true,100,2097152,'general | desktop | util');
 
-Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,STR_TAGS) values ('AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAA8','shake',false,100,2097152,'general | desktop');
-
 Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,STR_TAGS) values ('AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAA9','nuke',false,100,2097152,'general | desktop');
 
 Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,STR_TAGS) values ('AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAA11','preprocess',false,10,393216,'util');

diff --git a/sandbox/flyway.Dockerfile b/sandbox/flyway.Dockerfile
@@ -12,7 +12,7 @@ RUN ["cp", "/usr/share/java/postgresql-jdbc.jar", "jars/"]
 RUN ["mkdir", "/opt/migrations"]
 RUN ["mkdir", "/opt/scripts"]
 COPY ./cuebot/src/main/resources/conf/ddl/postgres/migrations /opt/migrations
-COPY ./cuebot/src/main/resources/conf/ddl/postgres/demo_data.sql /opt/scripts
+COPY ./cuebot/src/main/resources/conf/ddl/postgres/seed_data.sql /opt/scripts
 COPY ./sandbox/migrate.sh /opt/scripts/
 
 CMD ["/bin/bash"]
diff --git a/sandbox/migrate.sh b/sandbox/migrate.sh
@@ -18,5 +18,5 @@ done
 
 # Check if a show exists, if not apply demo data
 if psql -c "select 1 from show"|grep "(0 rows)"; then
- psql -a -f /opt/scripts/demo_data.sql
+ psql -a -f /opt/scripts/seed_data.sql
 fi
diff --git a/sandbox/setup-database.sh b/sandbox/setup-database.sh
@@ -149,7 +149,7 @@ read -n 1 -p "Select mode of population: " POPULATING_OPT
 if [[ $POPULATING_OPT -eq 1 ]]
 then
  wget ${BASE_URL}"${VERSION}"/schema-"${VERSION}".sql -P ./db-data/
- wget ${BASE_URL}"${VERSION}"/demo_data-"${VERSION}".sql -P ./db-data/
+ wget ${BASE_URL}"${VERSION}"/seed_data-"${VERSION}".sql -P ./db-data/
 
  echo ""
  echo "Populating the database schema and some initial data"
@@ -164,7 +164,7 @@ elif [[ $POPULATING_OPT -eq 2 ]]
 then
  brew install flyway ||
  flyway -url=jdbc:postgresql://$DB_HOST/$DB_NAME -user="$USER" -n -locations=filesystem:/cuebot/src/main/resources/conf/ddl/postgres/migrations migrate
- psql -h $DB_HOST -f /cuebot/src/main/resources/conf/ddl/postgres/demo_data.sql $DB_NAME
+ psql -h $DB_HOST -f /cuebot/src/main/resources/conf/ddl/postgres/seed_data.sql $DB_NAME
 else
  echo ""
  echo "Invalid option!"